Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0773192b authored by Peter P Waskiewicz Jr's avatar Peter P Waskiewicz Jr Committed by David S. Miller
Browse files

[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: default avatarPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Acked-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ffc8fefa

net/sched/sch_prio.c

+4 −2
Original line number Diff line number Diff line
@@ -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)