Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=60468d5b5b6931b4d4d704e26b5f17a6e476e6f8
Commit: 60468d5b5b6931b4d4d704e26b5f17a6e476e6f8
Parent: b206a65d671d359d0947f0b6da9d418c49a9b28a
Author: Venkatesh Pallipadi <[EMAIL PROTECTED]>
AuthorDate: Thu May 31 21:28:44 2007 -0700
Committer: David S. Miller <[EMAIL PROTECTED]>
CommitDate: Sun Jun 3 18:08:46 2007 -0700
[NET]: Make net watchdog timers 1 sec jiffy aligned.
round_jiffies for net dev watchdog timer.
Signed-off-by: Venkatesh Pallipadi <[EMAIL PROTECTED]>
Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
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 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);
}
}
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
