diff options
author | Paul Larson <pl@us.ibm.com> | 2008-06-25 02:00:56 +0200 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-06-27 07:27:46 +0200 |
commit | 6f4a0e45c6392f84436004d4c04d31b8ff5071c5 (patch) | |
tree | 173e74abb1cb535761defdf9bafe2ec08f564d43 | |
parent | tc35815: Fix receiver hangup on Rx FIFO overflow (diff) | |
download | linux-6f4a0e45c6392f84436004d4c04d31b8ff5071c5.tar.xz linux-6f4a0e45c6392f84436004d4c04d31b8ff5071c5.zip |
ixgbe: fix EEH recovery during reset on PPC
EEh is not recovering in a resonable amount of time on PPC during
ixgbe_down().
Signed-off-by: Paul Larson <pl@us.ibm.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
-rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 7b859220c255..8f0460901153 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c @@ -1969,7 +1969,8 @@ void ixgbe_down(struct ixgbe_adapter *adapter) netif_carrier_off(netdev); netif_stop_queue(netdev); - ixgbe_reset(adapter); + if (!pci_channel_offline(adapter->pdev)) + ixgbe_reset(adapter); ixgbe_clean_all_tx_rings(adapter); ixgbe_clean_all_rx_rings(adapter); |