diff options
| author | Patrick McHardy | 2007-03-16 09:21:40 +0100 |
|---|---|---|
| committer | David S. Miller | 2007-04-26 07:26:11 +0200 |
| commit | e9054a339eb275c756efeeaee42af484ac72a3f4 (patch) | |
| tree | 2751aa5f3338e48acb421dc7c772fd7e9a908f5e /net/sched/sch_cbq.c | |
| parent | [NET_SCHED]: sch_cbq: use hrtimer based watchdog (diff) | |
| download | kernel-qcow2-linux-e9054a339eb275c756efeeaee42af484ac72a3f4.tar.gz kernel-qcow2-linux-e9054a339eb275c756efeeaee42af484ac72a3f4.tar.xz kernel-qcow2-linux-e9054a339eb275c756efeeaee42af484ac72a3f4.zip | |
[NET_SCHED]: sch_cbq: fix cbq_undelay_prio for non-active priorites
cbq_undelay_prio is supposed to return a time delta, but returns the
current time for non-active priorities, causing cbq_undelay to mark
the priority as active and schedule a timer for twice the current
time.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_cbq.c')
| -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 d29d1212934d..32f6a308bad6 100644 --- a/net/sched/sch_cbq.c +++ b/net/sched/sch_cbq.c @@ -612,7 +612,7 @@ static unsigned long cbq_undelay_prio(struct cbq_sched_data *q, int prio) unsigned long sched = now; if (cl_prev == NULL) - return now; + return 0; do { cl = cl_prev->next_alive; |