From 486282b6febb87b2f8035b0a5dffec5e06beff92 Mon Sep 17 00:00:00 2001
From: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Date: Thu, 31 May 2007 21:28:44 -0700
Subject: [PATCH] --- yaml --- r: 57327 b: refs/heads/master c:
 60468d5b5b6931b4d4d704e26b5f17a6e476e6f8 h: refs/heads/master i:   57325:
 a4f3394205f021cab7f6eed4075a706025510c29   57323:
 1ad9a112751e54d95749412c9bf1ee205b6f7bdb   57319:
 6dd95fdbd3ba45580dc7ca41e7aa8e79eccf26a5   57311:
 45be2b92e75ad13623380134780f6a71144ca287 v: v3

---
 [refs]                        | 2 +-
 trunk/net/sched/sch_generic.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6fb6cb7a82d5..3a98413c6b33 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b206a65d671d359d0947f0b6da9d418c49a9b28a
+refs/heads/master: 60468d5b5b6931b4d4d704e26b5f17a6e476e6f8
diff --git a/trunk/net/sched/sch_generic.c b/trunk/net/sched/sch_generic.c
index cbefe225581e..f4d34480a093 100644
--- a/trunk/net/sched/sch_generic.c
+++ b/trunk/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);
 	}
 }