Unverified Commit f8a839fa authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12992 igb: Do not bring the device up after non-fatal error 

Merge Pull Request from: @ci-robot 
 
PR sync from: Kaixiong Yu <yukaixiong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/C3ZDZOGKQMTGUUO4TH4HJTTLBRUTLIHG/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAYRF1 
 
Link:https://gitee.com/openeuler/kernel/pulls/12992

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 65a69e1a 7c14dd30

drivers/net/ethernet/intel/igb/igb_main.c

+4 −0
Original line number Diff line number Diff line
@@ -9511,6 +9511,10 @@ static void igb_io_resume(struct pci_dev *pdev) 
	struct igb_adapter *adapter = netdev_priv(netdev);



	if (netif_running(netdev)) {

		if (!test_bit(__IGB_DOWN, &adapter->state)) {

			dev_dbg(&pdev->dev, "Resuming from non-fatal error, do nothing.\n");

			return;

		}

		if (igb_up(adapter)) {

			dev_err(&pdev->dev, "igb_up failed after reset\n");

			return;