user of the jiffies rounding code: e1000

[powerpc.git] / drivers / net / e1000 / e1000_main.c

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 9267f16..ed638d6 100644 (file)
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -2667,7 +2667,7 @@ e1000_watchdog(unsigned long data)
 
                        netif_carrier_on(netdev);
                        netif_wake_queue(netdev);
-                       mod_timer(&adapter->phy_info_timer, jiffies + 2 * HZ);
+                       mod_timer(&adapter->phy_info_timer, round_jiffies(jiffies + 2 * HZ));
                        adapter->smartspeed = 0;
                } else {
                        /* make sure the receive unit is started */
@@ -2684,7 +2684,7 @@ e1000_watchdog(unsigned long data)
                        DPRINTK(LINK, INFO, "NIC Link is Down\n");
                        netif_carrier_off(netdev);
                        netif_stop_queue(netdev);
-                       mod_timer(&adapter->phy_info_timer, jiffies + 2 * HZ);
+                       mod_timer(&adapter->phy_info_timer, round_jiffies(jiffies + 2 * HZ));
 
                        /* 80003ES2LAN workaround--
                         * For packet buffer work-around on link down event;
@@ -2736,7 +2736,7 @@ e1000_watchdog(unsigned long data)
                e1000_rar_set(&adapter->hw, adapter->hw.mac_addr, 0);
 
        /* Reset the timer */
-       mod_timer(&adapter->watchdog_timer, jiffies + 2 * HZ);
+       mod_timer(&adapter->watchdog_timer, round_jiffies(jiffies + 2 * HZ));
 }
 
 enum latency_range {