e1000e: io_error_detected callback should return PCI_ERS_RESULT_DISCONNECT
authorMike Mason <mmlnx@us.ibm.com>
Tue, 30 Jun 2009 12:45:53 +0000 (12:45 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 1 Jul 2009 02:47:02 +0000 (19:47 -0700)
on permanent failure

PCI drivers that implement the io_error_detected callback
should return PCI_ERS_RESULT_DISCONNECT if the state
passed in is pci_channel_io_perm_failure.  This state is not
checked in many of the network drivers.

This patch fixes the omission in the e1000e driver.

Signed-off-by: Mike Mason <mmlnx@us.ibm.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/e1000e/netdev.c

index 679885a122b4da068878a4bcd471c45ecd4e905a..63415bb6f48ff02f3e2e67ec45fef854fc1b9f39 100644 (file)
@@ -4785,6 +4785,9 @@ static pci_ers_result_t e1000_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))
                e1000e_down(adapter);
        pci_disable_device(pdev);