diff options
author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2008-06-24 17:01:15 -0700 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-06-27 01:27:47 -0400 |
commit | 3023682e74bc17debc6aa5e234ae1d0b0e198719 (patch) | |
tree | 3326df6abfbc039cf44abadba21e8d587caac1c4 /drivers | |
parent | 6f4a0e45c6392f84436004d4c04d31b8ff5071c5 (diff) | |
download | kernel_samsung_smdk4412-3023682e74bc17debc6aa5e234ae1d0b0e198719.zip kernel_samsung_smdk4412-3023682e74bc17debc6aa5e234ae1d0b0e198719.tar.gz kernel_samsung_smdk4412-3023682e74bc17debc6aa5e234ae1d0b0e198719.tar.bz2 |
igb: fix EEH recovery during reset on PPC
EEH is not recovering in a reasonable amount of time on PPC during
igb_down().
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/igb/igb_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index ae398f0..e79a26a 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c @@ -718,7 +718,8 @@ void igb_down(struct igb_adapter *adapter) adapter->link_speed = 0; adapter->link_duplex = 0; - igb_reset(adapter); + if (!pci_channel_offline(adapter->pdev)) + igb_reset(adapter); igb_clean_all_tx_rings(adapter); igb_clean_all_rx_rings(adapter); } |