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

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

index d4df9330c4478b2c87406f23e1de4a33abc32853..bd6d713c861a7bb330709ba1a978e980a23a27c3 100644 (file)
@@ -8636,6 +8636,9 @@ static pci_ers_result_t s2io_io_error_detected(struct pci_dev *pdev,
 
        netif_device_detach(netdev);
 
+       if (state == pci_channel_io_perm_failure)
+               return PCI_ERS_RESULT_DISCONNECT;
+
        if (netif_running(netdev)) {
                /* Bring down the card, while avoiding PCI I/O */
                do_s2io_card_down(sp, 0);