From 3ed603f5db9cc24a83f095d5ba7e1bf4fba83018 Mon Sep 17 00:00:00 2001 From: Peter P Waskiewicz Jr Date: Mon, 30 Jul 2007 17:13:45 -0700 Subject: [PATCH] --- yaml --- r: 63410 b: refs/heads/master c: 0773192b0f8914222cd27e682c49f978a6c7860a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/sched/sch_prio.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7e1b39796c98..bcc5e0ea1d02 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ffc8fefaf289fa485bc5c33e71572e6ce559d569 +refs/heads/master: 0773192b0f8914222cd27e682c49f978a6c7860a diff --git a/trunk/net/sched/sch_prio.c b/trunk/net/sched/sch_prio.c index 71bafde353a6..4a49db65772e 100644 --- a/trunk/net/sched/sch_prio.c +++ b/trunk/net/sched/sch_prio.c @@ -238,11 +238,13 @@ static int prio_tune(struct Qdisc *sch, struct rtattr *opt) /* If we're multiqueue, make sure the number of incoming bands * matches the number of queues on the device we're associating with. * If the number of bands requested is zero, then set q->bands to - * dev->egress_subqueue_count. + * dev->egress_subqueue_count. Also, the root qdisc must be the + * only one that is enabled for multiqueue, since it's the only one + * that interacts with the underlying device. */ q->mq = RTA_GET_FLAG(tb[TCA_PRIO_MQ - 1]); if (q->mq) { - if (sch->handle != TC_H_ROOT) + if (sch->parent != TC_H_ROOT) return -EINVAL; if (netif_is_multiqueue(sch->dev)) { if (q->bands == 0)