aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMike Mason <mmlnx@us.ibm.com>2009-06-30 12:45:53 +0000
committerDavid S. Miller <davem@davemloft.net>2009-06-30 19:47:02 -0700
commitc93b5a76d58656158d195a7df507ebc660010969 (patch)
tree08f3ad363dcae2efca6bcfaea661ab9a70cf047c /drivers
parenteab633021c26025b34f36f79f0311d3d99f40ceb (diff)
downloadkernel_samsung_espresso10-c93b5a76d58656158d195a7df507ebc660010969.zip
kernel_samsung_espresso10-c93b5a76d58656158d195a7df507ebc660010969.tar.gz
kernel_samsung_espresso10-c93b5a76d58656158d195a7df507ebc660010969.tar.bz2
e1000e: io_error_detected callback should return PCI_ERS_RESULT_DISCONNECT
on permanent failure 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. This patch fixes the omission in the e1000e driver. Signed-off-by: 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/e1000e/netdev.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 679885a..63415bb 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -4785,6 +4785,9 @@ static pci_ers_result_t e1000_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))
e1000e_down(adapter);
pci_disable_device(pdev);