From: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Date: Fri, 1 Jun 2007 04:28:44 +0000 (-0700)
Subject: [NET]: Make net watchdog timers 1 sec jiffy aligned.
X-Git-Tag: v2.6.22-rc4~5^2~5
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60468d5b5b6931b4d4d704e26b5f17a6e476e6f8;p=linux-2.6

[NET]: Make net watchdog timers 1 sec jiffy aligned.

round_jiffies for net dev watchdog timer.

Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index cbefe22558..f4d34480a0 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -224,7 +224,8 @@ void __netdev_watchdog_up(struct net_device *dev)
 	if (dev->tx_timeout) {
 		if (dev->watchdog_timeo <= 0)
 			dev->watchdog_timeo = 5*HZ;
-		if (!mod_timer(&dev->watchdog_timer, jiffies + dev->watchdog_timeo))
+		if (!mod_timer(&dev->watchdog_timer,
+			       round_jiffies(jiffies + dev->watchdog_timeo)))
 			dev_hold(dev);
 	}
 }