[NET]: Make net watchdog timers 1 sec jiffy aligned.
authorVenkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Fri, 1 Jun 2007 04:28:44 +0000 (21:28 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Mon, 4 Jun 2007 01:08:46 +0000 (18:08 -0700)
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>
net/sched/sch_generic.c

index cbefe225581e0b203d68b087653e81f18972dcd8..f4d34480a093d126061920e6f53e7b4fc8dfe83b 100644 (file)
@@ -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);
        }
 }