Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 6f7e3fde9e7c..0272afbdff37 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -3859,7 +3859,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)
@@ -5063,7 +5064,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);