aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBreno Leitao <leitao@linux.vnet.ibm.com>2009-05-06 06:44:26 -0400
committerDavid S. Miller <davem@davemloft.net>2009-05-06 18:33:47 -0400
commit3044b8d1ff8c05237652a692fb572a34e4d70146 (patch)
tree5927da29daf6d57507a2b66129a66d752ae408a3 /drivers
parent2012bdc8a5553fc864e78f582c8ce79e762dec42 (diff)
ixgbe: Return PCI_ERS_RESULT_DISCONNECT when bus is disabled
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 2c70fa0add3e..dd56adb2191a 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -5145,6 +5145,9 @@ static pci_ers_result_t ixgbe_io_error_detected(struct pci_dev *pdev,
5145 5145
5146 netif_device_detach(netdev); 5146 netif_device_detach(netdev);
5147 5147
5148 if (state == pci_channel_io_perm_failure)
5149 return PCI_ERS_RESULT_DISCONNECT;
5150
5148 if (netif_running(netdev)) 5151 if (netif_running(netdev))
5149 ixgbe_down(adapter); 5152 ixgbe_down(adapter);
5150 pci_disable_device(pdev); 5153 pci_disable_device(pdev);