summaryrefslogtreecommitdiff
path: root/drivers/net/bnx2.c
diff options
context:
space:
mode:
authorDean Nelson <dnelson@redhat.com>2009-07-31 09:13:18 +0000
committerDavid S. Miller <davem@davemloft.net>2009-08-01 23:11:47 -0700
commit2ec3de26d2dc666159b79a8b9394fa00b6f414ae (patch)
treee14bf384d28a71be2947c60cf473f0f83fe214fd /drivers/net/bnx2.c
parent0d6ab58da0465c42f34d9d4e7d91510278183c80 (diff)
downloadlwn-2ec3de26d2dc666159b79a8b9394fa00b6f414ae.tar.gz
lwn-2ec3de26d2dc666159b79a8b9394fa00b6f414ae.zip
bnx2: 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 bnx2. Signed-off-by: Dean Nelson <dnelson@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2.c')
-rw-r--r--drivers/net/bnx2.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index cec1b1746ae0..756d4b4f0a9f 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -8199,6 +8199,11 @@ static pci_ers_result_t bnx2_io_error_detected(struct pci_dev *pdev,
rtnl_lock();
netif_device_detach(dev);
+ if (state == pci_channel_io_perm_failure) {
+ rtnl_unlock();
+ return PCI_ERS_RESULT_DISCONNECT;
+ }
+
if (netif_running(dev)) {
bnx2_netif_stop(bp);
del_timer_sync(&bp->timer);