Merge tag 'spdx-5.2-rc3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[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 ebd306f0d2fca82dfa36fd49bb5e067df8297997..4e5d2e9ace5de537e383f3781003041556b4c102 100644 (file)
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -794,7 +794,7 @@ int tcf_action_dump(struct sk_buff *skb, struct tc_action *actions[],
 
        for (i = 0; i < TCA_ACT_MAX_PRIO && actions[i]; i++) {
                a = actions[i];
-               nest = nla_nest_start_noflag(skb, a->order);
+               nest = nla_nest_start_noflag(skb, i + 1);
                if (nest == NULL)
                        goto nla_put_failure;
                err = tcf_action_dump_1(skb, a, bind, ref);
@@ -1297,7 +1297,6 @@ tca_action_gd(struct net *net, struct nlattr *nla, struct nlmsghdr *n,
                        ret = PTR_ERR(act);
                        goto err;
                }
-               act->order = i;
                attr_size += tcf_action_fill_size(act);
                actions[i - 1] = act;
        }