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);
 	}
 }