diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-31 14:20:06 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-31 14:20:06 +0200 |
| commit | 3e83dfd5d8e374328078f527f1f7d189824896ab (patch) | |
| tree | 2f82b2e82f7a4b5c513fed42d4228a8bce938180 /net/sched/sch_api.c | |
| parent | 3308376a914b9c3f57a12072c063814403d983a8 (diff) | |
| parent | 9e52fc2b50de3a1c08b44f94c610fbe998c0031a (diff) | |
| download | talos-op-linux-3e83dfd5d8e374328078f527f1f7d189824896ab.tar.gz talos-op-linux-3e83dfd5d8e374328078f527f1f7d189824896ab.zip | |
Merge branch 'x86/mm' into x86/platform, to pick up TLB flush dependency
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 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) |
