summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@intel.com>2009-06-30 12:46:34 +0000
committerDavid S. Miller <davem@davemloft.net>2009-06-30 19:47:04 -0700
commit59ed6eecff4aa00c5c5d18ffd180acac108d596e (patch)
tree7de4c1f9b702847e9b684ab010110810ecf8b158
parentc93b5a76d58656158d195a7df507ebc660010969 (diff)
downloadlinux-3.10-59ed6eecff4aa00c5c5d18ffd180acac108d596e.tar.gz
linux-3.10-59ed6eecff4aa00c5c5d18ffd180acac108d596e.tar.bz2
linux-3.10-59ed6eecff4aa00c5c5d18ffd180acac108d596e.zip
igb: return PCI_ERS_RESULT_DISCONNECT on permanent error
PCI drivers that implement the io_error_detected callback should return PCI_ERS_RESULT_DISCONNECT if the state passed in is pci_channel_io_perm_failure. This patch fixes the issue for igb. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/igb/igb_main.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 468356d124e..be480292aba 100644
--- a/drivers/net/igb/igb_main.c
+++ b/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);