diff options
| author | Konstantin Khlebnikov <khlebnikov@yandex-team.ru> | 2017-08-15 16:39:05 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-30 10:21:39 +0200 |
| commit | 792c0707bd3fe4f7c25e4e748d20e1e54eccf547 (patch) | |
| tree | 99fbb1018fcff617d5a08fbe3447f105bb37f107 /net/sched | |
| parent | 38530f6e6dae4fdcd7ae5d48174b62a0f7858cbd (diff) | |
| download | linux-stable-792c0707bd3fe4f7c25e4e748d20e1e54eccf547.tar.gz linux-stable-792c0707bd3fe4f7c25e4e748d20e1e54eccf547.tar.bz2 linux-stable-792c0707bd3fe4f7c25e4e748d20e1e54eccf547.zip | |
net_sched: remove warning from qdisc_hash_add
[ Upstream commit c90e95147c27b1780e76c6e8fea1b5c78d7d387f ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/sched')
| -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 ff27a85a71a9..195a3b2d9afc 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c @@ -277,9 +277,6 @@ static struct Qdisc *qdisc_match_from_root(struct Qdisc *root, u32 handle) void qdisc_hash_add(struct Qdisc *q) { 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); } |