bnx2: return PCI_ERS_RESULT_DISCONNECT on permanent failure
authorDean Nelson <dnelson@redhat.com>
Fri, 31 Jul 2009 09:13:18 +0000 (09:13 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sun, 2 Aug 2009 06:11:47 +0000 (23:11 -0700)
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>
drivers/net/bnx2.c

index cec1b1746ae0f235ced302ad64b7e42076e732fe..756d4b4f0a9fda55053b732bc4562545514fd843 100644 (file)
@@ -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);