summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDean Nelson <dnelson@redhat.com>2009-07-31 09:13:40 +0000
committerDavid S. Miller <davem@davemloft.net>2009-08-01 23:11:59 -0700
commitd6a1f83b63e6999ee9374330ea2d7924e775aff7 (patch)
tree00634ac8a4aef2a47f25fd77ecca2141c03b5479
parentc06c430dedf71a0e9180d673191b9c9368aeaa65 (diff)
ixgb: return PCI_ERS_RESULT_DISCONNECT on permanent failure
PCI drivers that implement the struct pci_error_handlers' 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 ixgb. Signed-off-by: Dean Nelson <dnelson@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ixgb/ixgb_main.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index eb917f16027..fad08ce8a6c 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -2227,6 +2227,11 @@ static pci_ers_result_t ixgb_io_error_detected(struct pci_dev *pdev,
struct net_device *netdev = pci_get_drvdata(pdev);
struct ixgb_adapter *adapter = netdev_priv(netdev);
+ netif_device_detach(netdev);
+
+ if (state == pci_channel_io_perm_failure)
+ return PCI_ERS_RESULT_DISCONNECT;
+
if (netif_running(netdev))
ixgb_down(adapter, true);