diff options
author | Dean Nelson <dnelson@redhat.com> | 2009-07-31 05:13:18 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-08-02 02:11:47 -0400 |
commit | 2ec3de26d2dc666159b79a8b9394fa00b6f414ae (patch) | |
tree | e14bf384d28a71be2947c60cf473f0f83fe214fd | |
parent | 0d6ab58da0465c42f34d9d4e7d91510278183c80 (diff) |
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>
-rw-r--r-- | drivers/net/bnx2.c | 5 |
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, | |||
8199 | rtnl_lock(); | 8199 | rtnl_lock(); |
8200 | netif_device_detach(dev); | 8200 | netif_device_detach(dev); |
8201 | 8201 | ||
8202 | if (state == pci_channel_io_perm_failure) { | ||
8203 | rtnl_unlock(); | ||
8204 | return PCI_ERS_RESULT_DISCONNECT; | ||
8205 | } | ||
8206 | |||
8202 | if (netif_running(dev)) { | 8207 | if (netif_running(dev)) { |
8203 | bnx2_netif_stop(bp); | 8208 | bnx2_netif_stop(bp); |
8204 | del_timer_sync(&bp->timer); | 8209 | del_timer_sync(&bp->timer); |