* [PATCH] net_sched: remove warning from qdisc_hash_add
@ 2017-08-15 13:39 Konstantin Khlebnikov
2017-08-16 0:17 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Konstantin Khlebnikov @ 2017-08-15 13:39 UTC (permalink / raw)
To: netdev, David S. Miller, Cong Wang
Cc: Jiri Kosina, Eric Dumazet, Jamal Hadi Salim
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>
---
net/sched/sch_api.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index 18da45c0769c..2d2cf539668c 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)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] net_sched: remove warning from qdisc_hash_add
2017-08-15 13:39 [PATCH] net_sched: remove warning from qdisc_hash_add Konstantin Khlebnikov
@ 2017-08-16 0:17 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2017-08-16 0:17 UTC (permalink / raw)
To: khlebnikov; +Cc: netdev, xiyou.wangcong, jkosina, edumazet, jhs
From: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Date: Tue, 15 Aug 2017 16:39:05 +0300
> 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>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-08-16 0:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-15 13:39 [PATCH] net_sched: remove warning from qdisc_hash_add Konstantin Khlebnikov
2017-08-16 0:17 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).