aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ixgbe
diff options
context:
space:
mode:
authorPJ Waskiewicz <peter.p.waskiewicz.jr@intel.com>2008-11-07 07:16:08 -0500
committerDavid S. Miller <davem@davemloft.net>2008-11-16 03:31:35 -0500
commit74ad0a5421edc6ef13a4059c6076cd7a4f3a1fd5 (patch)
treeb3f8960c3588e5f2741e05b40155f8e30cf8dbfc /drivers/net/ixgbe
parentef711cf1d156428d4c2911b8c86c6ce90519dc45 (diff)
ixgbe: Fix usage of netif_*_all_queues() with netif_carrier_{off|on}()
netif_carrier_off() is sufficient to stop Tx into the driver. Stopping the Tx queues is redundant and unnecessary. By the same token, netif_carrier_on() will be sufficient to re-enable Tx, so waking the queues is unnecessary. Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@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/ixgbe')
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index ae06d48e9ebb..d1f80dd88bc9 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -1997,6 +1997,9 @@ static int ixgbe_up_complete(struct ixgbe_adapter *adapter)
1997 1997
1998 ixgbe_irq_enable(adapter); 1998 ixgbe_irq_enable(adapter);
1999 1999
2000 /* enable transmits */
2001 netif_tx_start_all_queues(netdev);
2002
2000 /* bring the link up in the watchdog, this could race with our first 2003 /* bring the link up in the watchdog, this could race with our first
2001 * link up interrupt but shouldn't be a problem */ 2004 * link up interrupt but shouldn't be a problem */
2002 adapter->flags |= IXGBE_FLAG_NEED_LINK_UPDATE; 2005 adapter->flags |= IXGBE_FLAG_NEED_LINK_UPDATE;
@@ -3247,7 +3250,6 @@ static void ixgbe_watchdog_task(struct work_struct *work)
3247 (FLOW_TX ? "TX" : "None")))); 3250 (FLOW_TX ? "TX" : "None"))));
3248 3251
3249 netif_carrier_on(netdev); 3252 netif_carrier_on(netdev);
3250 netif_tx_wake_all_queues(netdev);
3251 } else { 3253 } else {
3252 /* Force detection of hung controller */ 3254 /* Force detection of hung controller */
3253 adapter->detect_tx_hung = true; 3255 adapter->detect_tx_hung = true;
@@ -3258,7 +3260,6 @@ static void ixgbe_watchdog_task(struct work_struct *work)
3258 if (netif_carrier_ok(netdev)) { 3260 if (netif_carrier_ok(netdev)) {
3259 DPRINTK(LINK, INFO, "NIC Link is Down\n"); 3261 DPRINTK(LINK, INFO, "NIC Link is Down\n");
3260 netif_carrier_off(netdev); 3262 netif_carrier_off(netdev);
3261 netif_tx_stop_all_queues(netdev);
3262 } 3263 }
3263 } 3264 }
3264 3265
@@ -3943,7 +3944,6 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
3943 } 3944 }
3944 3945
3945 netif_carrier_off(netdev); 3946 netif_carrier_off(netdev);
3946 netif_tx_stop_all_queues(netdev);
3947 3947
3948 ixgbe_napi_add_all(adapter); 3948 ixgbe_napi_add_all(adapter);
3949 3949