---

yaml --- r: 57327 b: refs/heads/master c: 60468d5 h: refs/heads/master i: 57325: a4f3394 57323: 1ad9a11 57319: 6dd95fd 57311: 45be2b9 v: v3
git-mirror · Jun 4, 2007 · 486282b · 486282b
1 parent db5ead6
commit 486282b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);
 	}
 }