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

Commit cbdf4511 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net_sched: prio: properly report out of memory errors 



At Qdisc creation or change time, prio_tune() creates missing
pfifo qdiscs but does not return an error code if one
qdisc could not be allocated.

Leaving a qdisc in non operational state without telling user
anything about this problem is not good.

Also, testing if we replace something different than noop_qdisc
a second time makes no sense so I removed useless code.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 86ef7f9c

net/sched/sch_prio.c

+12 −20
Original line number Diff line number Diff line
@@ -202,27 +202,19 @@ static int prio_tune(struct Qdisc *sch, struct nlattr *opt) 
	sch_tree_unlock(sch);



	for (i = 0; i < q->bands; i++) {

		if (q->queues[i] == &noop_qdisc) {

			struct Qdisc *child, *old;

		struct Qdisc *child;



			child = qdisc_create_dflt(sch->dev_queue,

						  &pfifo_qdisc_ops,

		if (q->queues[i] != &noop_qdisc)

			continue;



		child = qdisc_create_dflt(sch->dev_queue, &pfifo_qdisc_ops,

					  TC_H_MAKE(sch->handle, i + 1));

			if (child) {

		if (!child)

			return -ENOMEM;

		sch_tree_lock(sch);

				old = q->queues[i];

		q->queues[i] = child;



				if (old != &noop_qdisc) {

					qdisc_tree_reduce_backlog(old,

								  old->q.qlen,

								  old->qstats.backlog);

					qdisc_destroy(old);

				}

		sch_tree_unlock(sch);

	}

		}

	}

	return 0;

}