All of lore.kernel.org
 help / color / mirror / Atom feed
From: Hangbin Liu <liuhangbin@gmail.com>
To: netdev@vger.kernel.org
Cc: Jamal Hadi Salim <jhs@mojatatu.com>,
	Cong Wang <xiyou.wangcong@gmail.com>,
	Jiri Pirko <jiri@resnulli.us>,
	"David S. Miller" <davem@davemloft.net>,
	Eric Dumazet <edumazet@google.com>,
	Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
	David Ahern <dsahern@kernel.org>,
	Stephen Hemminger <stephen@networkplumber.org>,
	Davide Caratti <dcaratti@redhat.com>,
	Pedro Tammela <pctammela@mojatatu.com>,
	Marcelo Leitner <mleitner@redhat.com>,
	Phil Sutter <psutter@redhat.com>,
	Hangbin Liu <liuhangbin@gmail.com>
Subject: [PATCH net 1/2] Revert "net/sched: act_api: move TCA_EXT_WARN_MSG to the correct hierarchy"
Date: Tue, 14 Mar 2023 14:58:01 +0800	[thread overview]
Message-ID: <20230314065802.1532741-2-liuhangbin@gmail.com> (raw)
In-Reply-To: <20230314065802.1532741-1-liuhangbin@gmail.com>

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>
---
 net/sched/act_api.c | 4 ++--
 1 file 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;
-- 
2.38.1


  reply	other threads:[~2023-03-14  6:58 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-14  6:58 [PATCH net 0/2] net/sched: fix parsing of TCA_EXT_WARN_MSG for tc action Hangbin Liu
2023-03-14  6:58 ` Hangbin Liu [this message]
2023-03-14 22:32   ` [PATCH net 1/2] Revert "net/sched: act_api: move TCA_EXT_WARN_MSG to the correct hierarchy" Jamal Hadi Salim
2023-03-14  6:58 ` [PATCH net 2/2] net/sched: act_api: add specific EXT_WARN_MSG for tc action Hangbin Liu
2023-03-14 22:35   ` Jamal Hadi Salim
2023-03-15  9:47     ` Hangbin Liu
2023-03-15 18:49       ` Jamal Hadi Salim
2023-03-16  3:33         ` Hangbin Liu
2023-03-16  9:39           ` Jamal Hadi Salim
2023-03-15  7:45   ` Jakub Kicinski
2023-03-15  9:39     ` Hangbin Liu
2023-03-15 18:47       ` Jamal Hadi Salim
2023-03-14  7:04 ` [PATCH iproute2 1/2] Revert "tc: m_action: fix parsing of TCA_EXT_WARN_MSG" Hangbin Liu
2023-03-14 12:10   ` Andrea Claudi
2023-03-15  7:46   ` Jakub Kicinski
2023-03-15  9:31     ` Hangbin Liu
2023-03-14  7:08 ` [PATCH iproute2 2/2] tc: m_action: fix parsing of TCA_EXT_WARN_MSG by using different enum Hangbin Liu
2023-03-14  9:22   ` Davide Caratti
2023-03-14  9:20 ` [PATCH net 0/2] net/sched: fix parsing of TCA_EXT_WARN_MSG for tc action Davide Caratti
2023-03-14 10:15   ` Hangbin Liu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230314065802.1532741-2-liuhangbin@gmail.com \
    --to=liuhangbin@gmail.com \
    --cc=davem@davemloft.net \
    --cc=dcaratti@redhat.com \
    --cc=dsahern@kernel.org \
    --cc=edumazet@google.com \
    --cc=jhs@mojatatu.com \
    --cc=jiri@resnulli.us \
    --cc=kuba@kernel.org \
    --cc=mleitner@redhat.com \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=pctammela@mojatatu.com \
    --cc=psutter@redhat.com \
    --cc=stephen@networkplumber.org \
    --cc=xiyou.wangcong@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.