diff options
| author | Konstantin Khlebnikov <khlebnikov@yandex-team.ru> | 2017-08-15 16:39:05 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-16 03:16:39 +0300 |
| commit | c90e95147c27b1780e76c6e8fea1b5c78d7d387f (patch) | |
| tree | cb5984fdaf9b630ebb4ab99d832e9b861bd78d99 /net | |
| parent | 325d5dc3f7e7c2840b65e4a2988c082c2c0025c5 (diff) | |
| download | linux-c90e95147c27b1780e76c6e8fea1b5c78d7d387f.tar.xz | |
net_sched: remove warning from qdisc_hash_add
It was added in commit e57a784d8cae ("pkt_sched: set root qdisc
before change() in attach_default_qdiscs()") to hide duplicates
from "tc qdisc show" for incative deivices.
After 59cc1f61f ("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 ea3274695353 ("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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sched/sch_api.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index bd24a550e0f9..a3fa144b8648 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c @@ -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) |