summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2007-03-16 12:31:28 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-25 22:26:16 -0700
commitbb239acf5679ee1936f6b1b034ad260c4fec89c8 (patch)
tree3c52cd966844e708ac0c4da5a08956a943be6bd7 /net
parent4361cb17f0df5491fe6e2c3ae1defc98e9a64a79 (diff)
[NET_SCHED]: sch_cbq: fix watchdog scheduled too late
q->now is increased during dequeue and doesn't contain the current time afterwards, resulting in a too large timeout value for the qdisc watchdog. Use "now" instead, which still contains the current time. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/sched/sch_cbq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c
index 0491fad97c0a..d83414d828d8 100644
--- a/net/sched/sch_cbq.c
+++ b/net/sched/sch_cbq.c
@@ -1070,7 +1070,7 @@ cbq_dequeue(struct Qdisc *sch)
sch->qstats.overlimits++;
if (q->wd_expires)
qdisc_watchdog_schedule(&q->watchdog,
- q->now + q->wd_expires);
+ now + q->wd_expires);
}
return NULL;
}