Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/net/sched/act_csum.c b/net/sched/act_csum.c
index 16e67e1c1db1981768bea8f2b8bef2451fd0c71f..cb8608f0a77a2a88671da430c79399c1fab0d77d 100644 (file)
--- a/net/sched/act_csum.c
+++ b/net/sched/act_csum.c
@@ -101,8 +101,8 @@ static int tcf_csum_init(struct net *net, struct nlattr *nla,
 
        spin_lock_bh(&p->tcf_lock);
        goto_ch = tcf_action_set_ctrlact(*a, parm->action, goto_ch);
-       rcu_swap_protected(p->params, params_new,
-                          lockdep_is_held(&p->tcf_lock));
+       params_new = rcu_replace_pointer(p->params, params_new,
+                                        lockdep_is_held(&p->tcf_lock));
        spin_unlock_bh(&p->tcf_lock);
 
        if (goto_ch)