diff options
| author | Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> | 2007-06-01 06:28:44 +0200 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-06-04 03:08:46 +0200 |
| commit | 60468d5b5b6931b4d4d704e26b5f17a6e476e6f8 (patch) | |
| tree | 24fefe03c24fadd0cefa2ef192a98ae80567514d /net | |
| parent | [ATM]: Fix warning. (diff) | |
| download | linux-60468d5b5b6931b4d4d704e26b5f17a6e476e6f8.tar.xz linux-60468d5b5b6931b4d4d704e26b5f17a6e476e6f8.zip | |
[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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sched/sch_generic.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index cbefe225581e..f4d34480a093 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); } } |