aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 bf36737e2ec7..d2f4d5f508b7 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -2078,6 +2078,9 @@ static int ixgbe_up_complete(struct ixgbe_adapter *adapter)
2078 2078
2079 ixgbe_irq_enable(adapter); 2079 ixgbe_irq_enable(adapter);
2080 2080
2081 /* enable transmits */
2082 netif_tx_start_all_queues(netdev);
2083
2081 /* bring the link up in the watchdog, this could race with our first 2084 /* bring the link up in the watchdog, this could race with our first
2082 * link up interrupt but shouldn't be a problem */ 2085 * link up interrupt but shouldn't be a problem */
2083 adapter->flags |= IXGBE_FLAG_NEED_LINK_UPDATE; 2086 adapter->flags |= IXGBE_FLAG_NEED_LINK_UPDATE;
@@ -3479,7 +3482,6 @@ static void ixgbe_watchdog_task(struct work_struct *work)
3479 (FLOW_TX ? "TX" : "None")))); 3482 (FLOW_TX ? "TX" : "None"))));
3480 3483
3481 netif_carrier_on(netdev); 3484 netif_carrier_on(netdev);
3482 netif_tx_wake_all_queues(netdev);
3483 } else { 3485 } else {
3484 /* Force detection of hung controller */ 3486 /* Force detection of hung controller */
3485 adapter->detect_tx_hung = true; 3487 adapter->detect_tx_hung = true;
@@ -3491,7 +3493,6 @@ static void ixgbe_watchdog_task(struct work_struct *work)
3491 printk(KERN_INFO "ixgbe: %s NIC Link is Down\n", 3493 printk(KERN_INFO "ixgbe: %s NIC Link is Down\n",
3492 netdev->name); 3494 netdev->name);
3493 netif_carrier_off(netdev); 3495 netif_carrier_off(netdev);
3494 netif_tx_stop_all_queues(netdev);
3495 } 3496 }
3496 } 3497 }
3497 3498
@@ -4222,7 +4223,6 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
4222 } 4223 }
4223 4224
4224 netif_carrier_off(netdev); 4225 netif_carrier_off(netdev);
4225 netif_tx_stop_all_queues(netdev);
4226 4226
4227 strcpy(netdev->name, "eth%d"); 4227 strcpy(netdev->name, "eth%d");
4228 err = register_netdev(netdev); 4228 err = register_netdev(netdev);