Commit c90e9514 authored Aug 15, 2017 by Konstantin Khlebnikov Committed by David S. Miller Aug 15, 2017

net_sched: remove warning from qdisc_hash_add



It was added in commit e57a784d ("pkt_sched: set root qdisc
before change() in attach_default_qdiscs()") to hide duplicates
from "tc qdisc show" for incative deivices.

After 59cc1f61 ("net: sched: convert qdisc linked list to hashtable")
it triggered when classful qdisc is added to inactive device because
default qdiscs are added before switching root qdisc.

Anyway after commit ea327469 ("net: sched: avoid duplicates in
qdisc dump") duplicates are filtered right in dumper.

Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 325d5dc3

net/sched/sch_api.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -286,9 +286,6 @@ static struct Qdisc qdisc_match_from_root(struct Qdisc root, u32 handle)
		void qdisc_hash_add(struct Qdisc *q, bool invisible)
		{
		if ((q->parent != TC_H_ROOT) && !(q->flags & TCQ_F_INGRESS)) {
		struct Qdisc *root = qdisc_dev(q)->qdisc;

		WARN_ON_ONCE(root == &noop_qdisc);
		ASSERT_RTNL();
		hash_add_rcu(qdisc_dev(q)->qdisc_hash, &q->hash, q->handle);
		if (invisible)

Admin message