From 70fa035f85eef501f9f8e884f4eae83db3ee1c73 Mon Sep 17 00:00:00 2001
From: Jesse Brandeburg <jesse.brandeburg@intel.com>
Date: Fri, 25 Sep 2009 12:17:01 +0000
Subject: [PATCH] --- yaml --- r: 166545 b: refs/heads/master c:
 51851073093f36a626de5f5eb1b87db9cae7e0d2 h: refs/heads/master i:   166543:
 78ed5ccfbffb5e654ddb1bb31e25a8734ea406be v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/e1000/e1000_main.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6bf793cfd1e9..6cc4e574dca2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 282b177782b6bea756f9d46f72422a7304693179
+refs/heads/master: 51851073093f36a626de5f5eb1b87db9cae7e0d2
diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c
index cad6f65fc1e9..4d6677e4f9f2 100644
--- a/trunk/drivers/net/e1000/e1000_main.c
+++ b/trunk/drivers/net/e1000/e1000_main.c
@@ -485,8 +485,7 @@ void e1000_down(struct e1000_adapter *adapter)
 	ew32(RCTL, rctl & ~E1000_RCTL_EN);
 	/* flush and sleep below */
 
-	/* can be netif_tx_disable when NETIF_F_LLTX is removed */
-	netif_stop_queue(netdev);
+	netif_tx_disable(netdev);
 
 	/* disable transmits in the hardware */
 	tctl = er32(TCTL);