Skip to content

Commit c90e951

Browse files
koct9idavem330
authored andcommitted
net_sched: remove warning from qdisc_hash_add
It was added in commit e57a784 ("pkt_sched: set root qdisc before change() in attach_default_qdiscs()") to hide duplicates from "tc qdisc show" for incative deivices. After 59cc1f6 ("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 ea32746 ("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>
1 parent 325d5dc commit c90e951

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

net/sched/sch_api.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -286,9 +286,6 @@ static struct Qdisc *qdisc_match_from_root(struct Qdisc *root, u32 handle)
286286
void qdisc_hash_add(struct Qdisc *q, bool invisible)
287287
{
288288
if ((q->parent != TC_H_ROOT) && !(q->flags & TCQ_F_INGRESS)) {
289-
struct Qdisc *root = qdisc_dev(q)->qdisc;
290-
291-
WARN_ON_ONCE(root == &noop_qdisc);
292289
ASSERT_RTNL();
293290
hash_add_rcu(qdisc_dev(q)->qdisc_hash, &q->hash, q->handle);
294291
if (invisible)

0 commit comments

Comments
 (0)