summaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e
diff options
context:
space:
mode:
authorJeff Kirsher <jeffrey.t.kirsher@intel.com>2008-06-24 17:01:29 -0700
committerJeff Garzik <jgarzik@redhat.com>2008-06-27 01:27:48 -0400
commit52cc30862a8f90c98be8eb527d00e5e06d398b22 (patch)
tree33aedffe56837661d8fefb9582f2e7684054a752 /drivers/net/e1000e
parent3023682e74bc17debc6aa5e234ae1d0b0e198719 (diff)
downloadop-kernel-dev-52cc30862a8f90c98be8eb527d00e5e06d398b22.zip
op-kernel-dev-52cc30862a8f90c98be8eb527d00e5e06d398b22.tar.gz
e1000e: fix EEH recovery during reset on PPC
EEH is not recovering in a reasonable amount of time on PPC during e1000e_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/net/e1000e')
-rw-r--r--drivers/net/e1000e/netdev.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index cab1835..648a87b 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -2535,7 +2535,8 @@ void e1000e_down(struct e1000_adapter *adapter)
adapter->link_speed = 0;
adapter->link_duplex = 0;
- e1000e_reset(adapter);
+ if (!pci_channel_offline(adapter->pdev))
+ e1000e_reset(adapter);
e1000_clean_tx_ring(adapter);
e1000_clean_rx_ring(adapter);
OpenPOWER on IntegriCloud