summaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2x_main.c
diff options
context:
space:
mode:
authorDean Nelson <dnelson@redhat.com>2009-07-31 09:13:25 +0000
committerDavid S. Miller <davem@davemloft.net>2009-08-01 23:11:53 -0700
commit07ce50e434b62c4de05207109ecd3d615b3cce42 (patch)
treed106c8dd57e4d203c4c740e890d5a88e9f6cddc0 /drivers/net/bnx2x_main.c
parent2ec3de26d2dc666159b79a8b9394fa00b6f414ae (diff)
downloadtalos-obmc-linux-07ce50e434b62c4de05207109ecd3d615b3cce42.tar.gz
talos-obmc-linux-07ce50e434b62c4de05207109ecd3d615b3cce42.zip
bnx2x: 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 bnx2x. Signed-off-by: Dean Nelson <dnelson@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2x_main.c')
-rw-r--r--drivers/net/bnx2x_main.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index 2d035d795f02..c92d1a498867 100644
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c
@@ -11690,6 +11690,11 @@ static pci_ers_result_t bnx2x_io_error_detected(struct pci_dev *pdev,
netif_device_detach(dev);
+ if (state == pci_channel_io_perm_failure) {
+ rtnl_unlock();
+ return PCI_ERS_RESULT_DISCONNECT;
+ }
+
if (netif_running(dev))
bnx2x_eeh_nic_unload(bp);
OpenPOWER on IntegriCloud