---

yaml --- r: 98534 b: refs/heads/master c: 52cc308 h: refs/heads/master v: v3
git-mirror · Jun 27, 2008 · 18e2484 · 18e2484
1 parent 6d8ce0d
commit 18e2484
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3023682e74bc17debc6aa5e234ae1d0b0e198719
+refs/heads/master: 52cc30862a8f90c98be8eb527d00e5e06d398b22
diff --git a/trunk/drivers/net/e1000e/netdev.c b/trunk/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);