[NET]: Fix prio_tune() handling of root qdisc.

Fix the check in prio_tune() to see if sch->parent is TC_H_ROOT instead of
sch->handle to load or reject the qdisc for multiqueue devices.

Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Acked-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c
index 71bafde353a6f038b083994aff7c67b4d6d040c5..4a49db65772e7c23d60214720d0db5ab4c844a59 100644 (file)
--- a/net/sched/sch_prio.c
+++ b/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)