diff options
author | Amnon Aaronsohn <bla@cs.huji.ac.il> | 2006-01-17 05:24:26 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-01-17 05:24:26 -0500 |
commit | dd914b4082cfbe28849898a0a98757827829c813 (patch) | |
tree | b1a022975ab230e9496fdcddbb057f0b0b0d7e41 | |
parent | 9343e79a7bb2d3268d68997163608b87d58d8098 (diff) |
[PKT_SCHED] sch_prio: fix qdisc bands init
Currently when PRIO is configured to use N bands, it lets the packets be
directed to any of the bands 0..N-1. However, PRIO attaches a fifo qdisc
only to the bands that appear in the priomap; the rest of the N bands
remain with a noop qdisc attached. This patch changes PRIO's behavior so
that it attaches a fifo qdisc to all of the N bands.
Signed-off-by: Amnon Aaronsohn <bla@cs.huji.ac.il>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/sched/sch_prio.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c index 5b3a3e48ed92..1641db33a994 100644 --- a/net/sched/sch_prio.c +++ b/net/sched/sch_prio.c | |||
@@ -228,14 +228,13 @@ static int prio_tune(struct Qdisc *sch, struct rtattr *opt) | |||
228 | } | 228 | } |
229 | sch_tree_unlock(sch); | 229 | sch_tree_unlock(sch); |
230 | 230 | ||
231 | for (i=0; i<=TC_PRIO_MAX; i++) { | 231 | for (i=0; i<q->bands; i++) { |
232 | int band = q->prio2band[i]; | 232 | if (q->queues[i] == &noop_qdisc) { |
233 | if (q->queues[band] == &noop_qdisc) { | ||
234 | struct Qdisc *child; | 233 | struct Qdisc *child; |
235 | child = qdisc_create_dflt(sch->dev, &pfifo_qdisc_ops); | 234 | child = qdisc_create_dflt(sch->dev, &pfifo_qdisc_ops); |
236 | if (child) { | 235 | if (child) { |
237 | sch_tree_lock(sch); | 236 | sch_tree_lock(sch); |
238 | child = xchg(&q->queues[band], child); | 237 | child = xchg(&q->queues[i], child); |
239 | 238 | ||
240 | if (child != &noop_qdisc) | 239 | if (child != &noop_qdisc) |
241 | qdisc_destroy(child); | 240 | qdisc_destroy(child); |