diff options
author | Dean Nelson <dnelson@redhat.com> | 2009-07-31 05:13:40 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-08-02 02:11:59 -0400 |
commit | d6a1f83b63e6999ee9374330ea2d7924e775aff7 (patch) | |
tree | 00634ac8a4aef2a47f25fd77ecca2141c03b5479 /drivers/net/ixgb | |
parent | c06c430dedf71a0e9180d673191b9c9368aeaa65 (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>
Diffstat (limited to 'drivers/net/ixgb')
-rw-r--r-- | drivers/net/ixgb/ixgb_main.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c index eb917f160274..fad08ce8a6c3 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, | |||
2227 | struct net_device *netdev = pci_get_drvdata(pdev); | 2227 | struct net_device *netdev = pci_get_drvdata(pdev); |
2228 | struct ixgb_adapter *adapter = netdev_priv(netdev); | 2228 | struct ixgb_adapter *adapter = netdev_priv(netdev); |
2229 | 2229 | ||
2230 | netif_device_detach(netdev); | ||
2231 | |||
2232 | if (state == pci_channel_io_perm_failure) | ||
2233 | return PCI_ERS_RESULT_DISCONNECT; | ||
2234 | |||
2230 | if (netif_running(netdev)) | 2235 | if (netif_running(netdev)) |
2231 | ixgb_down(adapter, true); | 2236 | ixgb_down(adapter, true); |
2232 | 2237 | ||