From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Wed, 25 Jun 2008 00:01:29 +0000 (-0700)
Subject: e1000e: fix EEH recovery during reset on PPC
X-Git-Tag: v2.6.26-rc9~84^2~40
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=52cc30862a8f90c98be8eb527d00e5e06d398b22;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index cab1835173c..648a87bbf46 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);