diff options
| author | Patrick McHardy <kaber@trash.net> | 2007-03-16 20:31:28 +0100 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 07:26:16 +0200 |
| commit | bb239acf5679ee1936f6b1b034ad260c4fec89c8 (patch) | |
| tree | 3c52cd966844e708ac0c4da5a08956a943be6bd7 | |
| parent | [NET_SCHED]: Export real timer resolution in /proc/net/psched (diff) | |
| download | linux-bb239acf5679ee1936f6b1b034ad260c4fec89c8.tar.xz linux-bb239acf5679ee1936f6b1b034ad260c4fec89c8.zip | |
[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>
| -rw-r--r-- | net/sched/sch_cbq.c | 2 |
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; } |