summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVenkatesh Pallipadi <venkatesh.pallipadi@intel.com>2007-05-31 21:28:44 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-06-03 18:08:46 -0700
commit60468d5b5b6931b4d4d704e26b5f17a6e476e6f8 (patch)
tree24fefe03c24fadd0cefa2ef192a98ae80567514d
parentb206a65d671d359d0947f0b6da9d418c49a9b28a (diff)
downloadop-kernel-dev-60468d5b5b6931b4d4d704e26b5f17a6e476e6f8.zip
op-kernel-dev-60468d5b5b6931b4d4d704e26b5f17a6e476e6f8.tar.gz
[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>
-rw-r--r--net/sched/sch_generic.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index cbefe22..f4d3448 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);
}
}
OpenPOWER on IntegriCloud