aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAndre Detsch <adetsch@br.ibm.com>2009-06-30 08:46:13 -0400
committerDavid S. Miller <davem@davemloft.net>2009-06-30 22:47:00 -0400
commiteab633021c26025b34f36f79f0311d3d99f40ceb (patch)
tree2480afd9c68fe414a83b7b0d753c421000d4321c /drivers
parent679be3ba0c493eb66d22c206273729ce50925e85 (diff)
e1000: 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 state is not checked in many of the network drivers. The patch fixes the omission in the e1000 driver. Based on Mike Mason's similar patch for e1000e. Signed-off-by: Andre Detsch <adetsch@br.ibm.com> CC: Mike Mason <mmlnx@us.ibm.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/e1000/e1000_main.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 972e06d984c8..5b8cbdb4b520 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -4823,6 +4823,9 @@ static pci_ers_result_t e1000_io_error_detected(struct pci_dev *pdev,
4823 4823
4824 netif_device_detach(netdev); 4824 netif_device_detach(netdev);
4825 4825
4826 if (state == pci_channel_io_perm_failure)
4827 return PCI_ERS_RESULT_DISCONNECT;
4828
4826 if (netif_running(netdev)) 4829 if (netif_running(netdev))
4827 e1000_down(adapter); 4830 e1000_down(adapter);
4828 pci_disable_device(pdev); 4831 pci_disable_device(pdev);