aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000/e1000_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/e1000/e1000_main.c')
-rw-r--r--drivers/net/e1000/e1000_main.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 0cf9ff2462ba..610a0cdbb68b 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -2439,10 +2439,9 @@ e1000_watchdog(unsigned long data)
2439 * disable receives in the ISR and 2439 * disable receives in the ISR and
2440 * reset device here in the watchdog 2440 * reset device here in the watchdog
2441 */ 2441 */
2442 if (adapter->hw.mac_type == e1000_80003es2lan) { 2442 if (adapter->hw.mac_type == e1000_80003es2lan)
2443 /* reset device */ 2443 /* reset device */
2444 schedule_work(&adapter->reset_task); 2444 schedule_work(&adapter->reset_task);
2445 }
2446 } 2445 }
2447 2446
2448 e1000_smartspeed(adapter); 2447 e1000_smartspeed(adapter);
@@ -3677,7 +3676,7 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter,
3677 E1000_DBG("%s: Receive packet consumed multiple" 3676 E1000_DBG("%s: Receive packet consumed multiple"
3678 " buffers\n", netdev->name); 3677 " buffers\n", netdev->name);
3679 /* recycle */ 3678 /* recycle */
3680 buffer_info-> skb = skb; 3679 buffer_info->skb = skb;
3681 goto next_desc; 3680 goto next_desc;
3682 } 3681 }
3683 3682