Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-beck.git] / drivers / net / forcedeth.c

diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 980c2c229a71d5fa9a0b59c5921ad61aaf627f16..4708a1631925e5aadb1615ea35f1da71d9465e16 100644 (file)
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -3861,7 +3861,8 @@ static void nv_do_stats_poll(unsigned long data)
        nv_get_hw_stats(dev);
 
        if (!np->in_shutdown)
-               mod_timer(&np->stats_poll, jiffies + STATS_INTERVAL);
+               mod_timer(&np->stats_poll,
+                       round_jiffies(jiffies + STATS_INTERVAL));
 }
 
 static void nv_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
@@ -5065,7 +5066,8 @@ static int nv_open(struct net_device *dev)
 
        /* start statistics timer */
        if (np->driver_data & (DEV_HAS_STATISTICS_V1|DEV_HAS_STATISTICS_V2))
-               mod_timer(&np->stats_poll, jiffies + STATS_INTERVAL);
+               mod_timer(&np->stats_poll,
+                       round_jiffies(jiffies + STATS_INTERVAL));
 
        spin_unlock_irq(&np->lock);