]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ixgbe: Return PCI_ERS_RESULT_DISCONNECT when bus is disabled
authorBreno Leitao <leitao@linux.vnet.ibm.com>
Wed, 6 May 2009 10:44:26 +0000 (10:44 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 6 May 2009 22:33:47 +0000 (15:33 -0700)
According to the "PCI Error Recovery" document, if after a recovery,
the bus is disabled, the error_detected function should return
PCI_ERS_RESULT_DISCONNECT. Actually ixgbe error_detected function is
always returning PCI_ERS_RESULT_NEED_RESET, even if the bus is in failure.
This patch just check if the bus is disabled and then returns
PCI_ERS_RESULT_DISCONNET.

Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ixgbe/ixgbe_main.c

index 2c70fa0add3e14ab60631585e246cecc6740d8c1..dd56adb2191a8f7699bf330f8d525fc50bf24bd0 100644 (file)
@@ -5145,6 +5145,9 @@ static pci_ers_result_t ixgbe_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))
                ixgbe_down(adapter);
        pci_disable_device(pdev);