diff options
author | Pedro Tammela <pctammela@mojatatu.com> | 2023-02-24 18:56:01 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2023-02-27 13:16:34 +0100 |
commit | 923b2e30dc9cd05931da0f64e2e23d040865c035 (patch) | |
tree | c04530fffe7f9f83e2736dfab3c052072a514b20 /net/sched/act_api.c | |
parent | net: dsa: ocelot_ext: remove unnecessary phylink.h include (diff) | |
download | linux-923b2e30dc9cd05931da0f64e2e23d040865c035.tar.xz linux-923b2e30dc9cd05931da0f64e2e23d040865c035.zip |
net/sched: act_api: move TCA_EXT_WARN_MSG to the correct hierarchy
TCA_EXT_WARN_MSG is currently sitting outside of the expected hierarchy
for the tc actions code. It should sit within TCA_ACT_TAB.
Fixes: 0349b8779cc9 ("sched: add new attr TCA_EXT_WARN_MSG to report tc extact message")
Reviewed-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Pedro Tammela <pctammela@mojatatu.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/act_api.c')
-rw-r--r-- | net/sched/act_api.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/act_api.c b/net/sched/act_api.c index fce522886099..34c508675041 100644 --- a/net/sched/act_api.c +++ b/net/sched/act_api.c @@ -1596,12 +1596,12 @@ static int tca_get_fill(struct sk_buff *skb, struct tc_action *actions[], if (tcf_action_dump(skb, actions, bind, ref, false) < 0) goto out_nlmsg_trim; - nla_nest_end(skb, nest); - if (extack && extack->_msg && nla_put_string(skb, TCA_EXT_WARN_MSG, extack->_msg)) goto out_nlmsg_trim; + nla_nest_end(skb, nest); + nlh->nlmsg_len = skb_tail_pointer(skb) - b; return skb->len; |