e1000: use netif_tx_disable
authorJesse Brandeburg <jesse.brandeburg@intel.com>
Fri, 25 Sep 2009 12:17:01 +0000 (12:17 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sun, 27 Sep 2009 03:15:29 +0000 (20:15 -0700)
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>
drivers/net/e1000/e1000_main.c

index cad6f65fc1e92c1a63ee9dd912da297371bd6779..4d6677e4f9f26933e823c6cb66ffe1627da6329e 100644 (file)
@@ -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);