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

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
...@@ -202,26 +202,18 @@ static int prio_tune(struct Qdisc *sch, struct nlattr *opt) ...@@ -202,26 +202,18 @@ static int prio_tune(struct Qdisc *sch, struct nlattr *opt)
sch_tree_unlock(sch); sch_tree_unlock(sch);
for (i = 0; i < q->bands; i++) { for (i = 0; i < q->bands; i++) {
if (q->queues[i] == &noop_qdisc) { struct Qdisc *child;
struct Qdisc *child, *old;
if (q->queues[i] != &noop_qdisc)
child = qdisc_create_dflt(sch->dev_queue, continue;
&pfifo_qdisc_ops,
TC_H_MAKE(sch->handle, i + 1)); child = qdisc_create_dflt(sch->dev_queue, &pfifo_qdisc_ops,
if (child) { TC_H_MAKE(sch->handle, i + 1));
sch_tree_lock(sch); if (!child)
old = q->queues[i]; return -ENOMEM;
q->queues[i] = child; sch_tree_lock(sch);
q->queues[i] = child;
if (old != &noop_qdisc) { sch_tree_unlock(sch);
qdisc_tree_reduce_backlog(old,
old->q.qlen,
old->qstats.backlog);
qdisc_destroy(old);
}
sch_tree_unlock(sch);
}
}
} }
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment