qlge: return PCI_ERS_RESULT_DISCONNECT on permanent failure
authorDean Nelson <dnelson@redhat.com>
Fri, 31 Jul 2009 09:13:48 +0000 (09:13 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sun, 2 Aug 2009 06:12:03 +0000 (23:12 -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 qlge.

Signed-off-by: Dean Nelson <dnelson@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/qlge/qlge_main.c

index 5768af1..3a271af 100644 (file)
@@ -4076,6 +4076,11 @@ static pci_ers_result_t qlge_io_error_detected(struct pci_dev *pdev,
        struct net_device *ndev = pci_get_drvdata(pdev);
        struct ql_adapter *qdev = netdev_priv(ndev);
 
+       netif_device_detach(ndev);
+
+       if (state == pci_channel_io_perm_failure)
+               return PCI_ERS_RESULT_DISCONNECT;
+
        if (netif_running(ndev))
                ql_adapter_down(qdev);