From e4f257ef3e6f5301eec7f6364a18f90b721aa4fd Mon Sep 17 00:00:00 2001 From: Alexander Duyck Date: Tue, 30 Jun 2009 12:46:34 +0000 Subject: [PATCH] --- yaml --- r: 154705 b: refs/heads/master c: 59ed6eecff4aa00c5c5d18ffd180acac108d596e h: refs/heads/master i: 154703: 625eb32ea496cb66b232fa4c1269d1207c938d5a v: v3 --- [refs] | 2 +- trunk/drivers/net/igb/igb_main.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 699496e69a88..b5e5a5237396 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c93b5a76d58656158d195a7df507ebc660010969 +refs/heads/master: 59ed6eecff4aa00c5c5d18ffd180acac108d596e diff --git a/trunk/drivers/net/igb/igb_main.c b/trunk/drivers/net/igb/igb_main.c index 468356d124ea..be480292aba1 100644 --- a/trunk/drivers/net/igb/igb_main.c +++ b/trunk/drivers/net/igb/igb_main.c @@ -5339,6 +5339,9 @@ static pci_ers_result_t igb_io_error_detected(struct pci_dev *pdev, netif_device_detach(netdev); + if (state == pci_channel_io_perm_failure) + return PCI_ERS_RESULT_DISCONNECT; + if (netif_running(netdev)) igb_down(adapter); pci_disable_device(pdev);