diff options
author | Jesse Brandeburg <jesse.brandeburg@intel.com> | 2009-09-25 08:17:01 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-26 23:15:29 -0400 |
commit | 51851073093f36a626de5f5eb1b87db9cae7e0d2 (patch) | |
tree | b78b351ca6531e8efd531db04795627d7f0d6891 /drivers/net | |
parent | 282b177782b6bea756f9d46f72422a7304693179 (diff) |
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>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/e1000/e1000_main.c | 3 |
1 files changed, 1 insertions, 2 deletions
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) | |||
485 | ew32(RCTL, rctl & ~E1000_RCTL_EN); | 485 | ew32(RCTL, rctl & ~E1000_RCTL_EN); |
486 | /* flush and sleep below */ | 486 | /* flush and sleep below */ |
487 | 487 | ||
488 | /* can be netif_tx_disable when NETIF_F_LLTX is removed */ | 488 | netif_tx_disable(netdev); |
489 | netif_stop_queue(netdev); | ||
490 | 489 | ||
491 | /* disable transmits in the hardware */ | 490 | /* disable transmits in the hardware */ |
492 | tctl = er32(TCTL); | 491 | tctl = er32(TCTL); |