Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

[linux.git] / net / sched / act_api.c

diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index 7fc1e2c1b65634afd4f3f44075a98c0e82e6ee7e..90a31b15585f61a5a3c406eb3e3985679164e044 100644 (file)
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -88,7 +88,7 @@ struct tcf_chain *tcf_action_set_ctrlact(struct tc_action *a, int action,
                                         struct tcf_chain *goto_chain)
 {
        a->tcfa_action = action;
-       rcu_swap_protected(a->goto_chain, goto_chain, 1);
+       goto_chain = rcu_replace_pointer(a->goto_chain, goto_chain, 1);
        return goto_chain;
 }
 EXPORT_SYMBOL(tcf_action_set_ctrlact);