From: Hangbin Liu <liuhangbin@gmail.com>
Date: Thu, 16 Mar 2023 03:37:52 +0000 (+0800)
Subject: Revert "net/sched: act_api: move TCA_EXT_WARN_MSG to the correct hierarchy"
X-Git-Tag: v6.1.37~214
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ab1bbd79f48ec35fe17c04a657ca53216cc8f7d1;p=platform%2Fkernel%2Flinux-starfive.git

Revert "net/sched: act_api: move TCA_EXT_WARN_MSG to the correct hierarchy"

commit 8de2bd02439eb839a452a853c1004c2c45ff6fef upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index 2bdcaf4..cc6628a 100644
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -1603,12 +1603,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;