diff options
| author | Andre Detsch <adetsch@br.ibm.com> | 2009-06-30 14:46:13 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-01 04:47:00 +0200 |
| commit | eab633021c26025b34f36f79f0311d3d99f40ceb (patch) | |
| tree | 2480afd9c68fe414a83b7b0d753c421000d4321c /drivers/net/e1000 | |
| parent | e1000: fix unmap bug (diff) | |
| download | linux-eab633021c26025b34f36f79f0311d3d99f40ceb.tar.xz linux-eab633021c26025b34f36f79f0311d3d99f40ceb.zip | |
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/net/e1000')
| -rw-r--r-- | drivers/net/e1000/e1000_main.c | 3 |
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, netif_device_detach(netdev); + if (state == pci_channel_io_perm_failure) + return PCI_ERS_RESULT_DISCONNECT; + if (netif_running(netdev)) e1000_down(adapter); pci_disable_device(pdev); |