diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-08-25 05:04:51 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-08-25 05:04:51 -0400 |
commit | 10c9850cb2ced2ce528e5b692c639974213a64ec (patch) | |
tree | f8063beac0ba1dab069d25661845c5b7ef9a67c7 /net/sched/cls_api.c | |
parent | 0c2364791343e4b04cd1f097ff2abc2799062448 (diff) | |
parent | 90a6cd503982bfd33ce8c70eb49bd2dd33bc6325 (diff) |
Merge branch 'linus' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/sched/cls_api.c')
-rw-r--r-- | net/sched/cls_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index 39da0c5801c9..9fd44c221347 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c | |||
@@ -205,7 +205,7 @@ static void tcf_chain_flush(struct tcf_chain *chain) | |||
205 | { | 205 | { |
206 | struct tcf_proto *tp; | 206 | struct tcf_proto *tp; |
207 | 207 | ||
208 | if (*chain->p_filter_chain) | 208 | if (chain->p_filter_chain) |
209 | RCU_INIT_POINTER(*chain->p_filter_chain, NULL); | 209 | RCU_INIT_POINTER(*chain->p_filter_chain, NULL); |
210 | while ((tp = rtnl_dereference(chain->filter_chain)) != NULL) { | 210 | while ((tp = rtnl_dereference(chain->filter_chain)) != NULL) { |
211 | RCU_INIT_POINTER(chain->filter_chain, tp->next); | 211 | RCU_INIT_POINTER(chain->filter_chain, tp->next); |