aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/e1000/e1000_main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 9267f16b1b32..ed638d676fcf 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -2667,7 +2667,7 @@ e1000_watchdog(unsigned long data)
2667 2667
2668 netif_carrier_on(netdev); 2668 netif_carrier_on(netdev);
2669 netif_wake_queue(netdev); 2669 netif_wake_queue(netdev);
2670 mod_timer(&adapter->phy_info_timer, jiffies + 2 * HZ); 2670 mod_timer(&adapter->phy_info_timer, round_jiffies(jiffies + 2 * HZ));
2671 adapter->smartspeed = 0; 2671 adapter->smartspeed = 0;
2672 } else { 2672 } else {
2673 /* make sure the receive unit is started */ 2673 /* make sure the receive unit is started */
@@ -2684,7 +2684,7 @@ e1000_watchdog(unsigned long data)
2684 DPRINTK(LINK, INFO, "NIC Link is Down\n"); 2684 DPRINTK(LINK, INFO, "NIC Link is Down\n");
2685 netif_carrier_off(netdev); 2685 netif_carrier_off(netdev);
2686 netif_stop_queue(netdev); 2686 netif_stop_queue(netdev);
2687 mod_timer(&adapter->phy_info_timer, jiffies + 2 * HZ); 2687 mod_timer(&adapter->phy_info_timer, round_jiffies(jiffies + 2 * HZ));
2688 2688
2689 /* 80003ES2LAN workaround-- 2689 /* 80003ES2LAN workaround--
2690 * For packet buffer work-around on link down event; 2690 * For packet buffer work-around on link down event;
@@ -2736,7 +2736,7 @@ e1000_watchdog(unsigned long data)
2736 e1000_rar_set(&adapter->hw, adapter->hw.mac_addr, 0); 2736 e1000_rar_set(&adapter->hw, adapter->hw.mac_addr, 0);
2737 2737
2738 /* Reset the timer */ 2738 /* Reset the timer */
2739 mod_timer(&adapter->watchdog_timer, jiffies + 2 * HZ); 2739 mod_timer(&adapter->watchdog_timer, round_jiffies(jiffies + 2 * HZ));
2740} 2740}
2741 2741
2742enum latency_range { 2742enum latency_range {