diff options
| author |   Hangbin Liu <liuhangbin@gmail.com> | 2023-03-16 11:37:52 +0800 |
|---|---|---|
| committer |   Jakub Kicinski <kuba@kernel.org> | 2023-03-16 21:25:45 -0700 |
| commit | 8de2bd02439eb839a452a853c1004c2c45ff6fef (patch) | |
| tree | 7c6ae140ff3f46098674e8890f4f6c1d4e222b00 /net/sched/act_api.c | |
| parent | net: dsa: microchip: fix RGMII delay configuration on KSZ8765/KSZ8794/KSZ8795 (diff) | |
| download | wireguard-linux-8de2bd02439eb839a452a853c1004c2c45ff6fef.tar.xz wireguard-linux-8de2bd02439eb839a452a853c1004c2c45ff6fef.zip | |
Revert "net/sched: act_api: move TCA_EXT_WARN_MSG to the correct hierarchy"
This reverts commit 923b2e30dc9cd05931da0f64e2e23d040865c035.
This is not a correct fix as TCA_EXT_WARN_MSG is not a hierarchy to
TCA_ACT_TAB. I didn't notice the TC actions use different enum when adding
TCA_EXT_WARN_MSG. To fix the difference I will add a new WARN enum in
TCA_ROOT_MAX as Jamal suggested.
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to '')
| -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 34c508675041..fce522886099 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; |