From: Jesse Brandeburg <jesse.brandeburg@intel.com>
Date: Fri, 25 Sep 2009 12:17:01 +0000 (+0000)
Subject: e1000: use netif_tx_disable
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=51851073093f36a626de5f5eb1b87db9cae7e0d2;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

e1000: use netif_tx_disable

we can use netif_tx_disable now because LLTX has been removed.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index cad6f65fc1e9..4d6677e4f9f2 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/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);