diff options
Diffstat (limited to 'drivers/net/e1000')
-rw-r--r-- | drivers/net/e1000/e1000_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 112e6b039983..71d4fe15976a 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
@@ -498,6 +498,8 @@ int e1000_up(struct e1000_adapter *adapter) | |||
498 | 498 | ||
499 | e1000_irq_enable(adapter); | 499 | e1000_irq_enable(adapter); |
500 | 500 | ||
501 | netif_wake_queue(adapter->netdev); | ||
502 | |||
501 | /* fire a link change interrupt to start the watchdog */ | 503 | /* fire a link change interrupt to start the watchdog */ |
502 | ew32(ICS, E1000_ICS_LSC); | 504 | ew32(ICS, E1000_ICS_LSC); |
503 | return 0; | 505 | return 0; |
@@ -2591,7 +2593,6 @@ static void e1000_watchdog(unsigned long data) | |||
2591 | ew32(TCTL, tctl); | 2593 | ew32(TCTL, tctl); |
2592 | 2594 | ||
2593 | netif_carrier_on(netdev); | 2595 | netif_carrier_on(netdev); |
2594 | netif_wake_queue(netdev); | ||
2595 | mod_timer(&adapter->phy_info_timer, round_jiffies(jiffies + 2 * HZ)); | 2596 | mod_timer(&adapter->phy_info_timer, round_jiffies(jiffies + 2 * HZ)); |
2596 | adapter->smartspeed = 0; | 2597 | adapter->smartspeed = 0; |
2597 | } else { | 2598 | } else { |
@@ -2608,7 +2609,6 @@ static void e1000_watchdog(unsigned long data) | |||
2608 | printk(KERN_INFO "e1000: %s NIC Link is Down\n", | 2609 | printk(KERN_INFO "e1000: %s NIC Link is Down\n", |
2609 | netdev->name); | 2610 | netdev->name); |
2610 | netif_carrier_off(netdev); | 2611 | netif_carrier_off(netdev); |
2611 | netif_stop_queue(netdev); | ||
2612 | mod_timer(&adapter->phy_info_timer, round_jiffies(jiffies + 2 * HZ)); | 2612 | mod_timer(&adapter->phy_info_timer, round_jiffies(jiffies + 2 * HZ)); |
2613 | 2613 | ||
2614 | /* 80003ES2LAN workaround-- | 2614 | /* 80003ES2LAN workaround-- |