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

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

diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index bda1ba25c59e973709998b7e6279eee30589cbb8..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);
@@ -1003,7 +1003,6 @@ int tcf_action_init(struct net *net, struct tcf_proto *tp, struct nlattr *nla,
                        err = PTR_ERR(act);
                        goto err;
                }
-               act->order = i;
                sz += tcf_action_fill_size(act);
                /* Start from index 0 */
                actions[i - 1] = act;