diff options
author | Jesse Brandeburg <jesse.brandeburg@intel.com> | 2009-04-21 18:42:05 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-04-22 00:47:54 -0700 |
commit | 4cb9be7ab47820a1fa747569f5f035a5f628c91b (patch) | |
tree | f272447c9bdc5b01578760f1c0f973a183f801b5 /drivers/net/ixgb/ixgb_main.c | |
parent | bf98a82633b97fb638fcee0fae3c0de54d1f7b05 (diff) | |
download | kernel_samsung_smdk4412-4cb9be7ab47820a1fa747569f5f035a5f628c91b.zip kernel_samsung_smdk4412-4cb9be7ab47820a1fa747569f5f035a5f628c91b.tar.gz kernel_samsung_smdk4412-4cb9be7ab47820a1fa747569f5f035a5f628c91b.tar.bz2 |
e1000/e1000e/igb/ixgb: do not use netif_wake_queue un-necessarily
It was pointed out that the Intel wired ethernet drivers do not need to
wake the tx queue since netif_carrier_on/off will take care of the qdisc
management in order to guarantee the correct handling of the transmit
routine enable state.
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@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/ixgb/ixgb_main.c')
-rw-r--r-- | drivers/net/ixgb/ixgb_main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c index ff741ca..cb9ecc4 100644 --- a/drivers/net/ixgb/ixgb_main.c +++ b/drivers/net/ixgb/ixgb_main.c @@ -266,6 +266,8 @@ ixgb_up(struct ixgb_adapter *adapter) napi_enable(&adapter->napi); ixgb_irq_enable(adapter); + netif_wake_queue(netdev); + mod_timer(&adapter->watchdog_timer, jiffies); return 0; @@ -1118,7 +1120,6 @@ ixgb_watchdog(unsigned long data) adapter->link_speed = 10000; adapter->link_duplex = FULL_DUPLEX; netif_carrier_on(netdev); - netif_wake_queue(netdev); } } else { if (netif_carrier_ok(netdev)) { @@ -1127,8 +1128,6 @@ ixgb_watchdog(unsigned long data) printk(KERN_INFO "ixgb: %s NIC Link is Down\n", netdev->name); netif_carrier_off(netdev); - netif_stop_queue(netdev); - } } |