diff options
| author | David S. Miller <davem@davemloft.net> | 2017-08-15 20:23:23 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-15 20:23:23 -0700 |
| commit | 463910e2dff580e4e9a678af710b4818b5189691 (patch) | |
| tree | 21b4e53cdbec7e5a537ddfc1598fbf17deae57e2 /net/sched/sch_api.c | |
| parent | 22cb7a3ac380ecaab6837670963813599b123a53 (diff) | |
| parent | 510c8a899caf095cb13d09d203573deef15db2fe (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/sched/sch_api.c')
| -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 816c8092e601..361377fbd780 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) |