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

[linux-2.6-block.git] / net / sched / act_ife.c

diff --git a/net/sched/act_ife.c b/net/sched/act_ife.c
index d562c88cccbe35dc9608ec3dd0787cf0ae539173..5e6379028fc392031f4b84599f666a2c61f071d2 100644 (file)
--- a/net/sched/act_ife.c
+++ b/net/sched/act_ife.c
@@ -595,7 +595,7 @@ static int tcf_ife_init(struct net *net, struct nlattr *nla,
                spin_lock_bh(&ife->tcf_lock);
        /* protected by tcf_lock when modifying existing action */
        goto_ch = tcf_action_set_ctrlact(*a, parm->action, goto_ch);
-       rcu_swap_protected(ife->params, p, 1);
+       p = rcu_replace_pointer(ife->params, p, 1);
 
        if (exists)
                spin_unlock_bh(&ife->tcf_lock);