From 80af6bb2e961d770ccee2ba0ae53d8f286b9d0f8 Mon Sep 17 00:00:00 2001 From: Daniel Drake Date: Tue, 18 Mar 2008 11:07:18 +0000 Subject: [PATCH] --- yaml --- r: 90388 b: refs/heads/master c: bfebbb88eca12a01fff1fbee2b8e1a4e932b799b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/forcedeth.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4162f9c4167c..07e7954b8e78 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3459feb8fc0e2a6d3fe5c6eb8c05cdab2c04871c +refs/heads/master: bfebbb88eca12a01fff1fbee2b8e1a4e932b799b diff --git a/trunk/drivers/net/forcedeth.c b/trunk/drivers/net/forcedeth.c index 6f7e3fde9e7c..0272afbdff37 100644 --- a/trunk/drivers/net/forcedeth.c +++ b/trunk/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);