[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAM0EoM=Wcs46vnE81aCt2W8baxi91m8y+t0bzUPL5PEm7PQLDw@mail.gmail.com>
Date: Tue, 14 Mar 2023 18:32:34 -0400
From: Jamal Hadi Salim <jhs@...atatu.com>
To: Hangbin Liu <liuhangbin@...il.com>
Cc: netdev@...r.kernel.org, Cong Wang <xiyou.wangcong@...il.com>,
Jiri Pirko <jiri@...nulli.us>,
"David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>,
David Ahern <dsahern@...nel.org>,
Stephen Hemminger <stephen@...workplumber.org>,
Davide Caratti <dcaratti@...hat.com>,
Pedro Tammela <pctammela@...atatu.com>,
Marcelo Leitner <mleitner@...hat.com>,
Phil Sutter <psutter@...hat.com>
Subject: Re: [PATCH net 1/2] Revert "net/sched: act_api: move TCA_EXT_WARN_MSG
to the correct hierarchy"
On Tue, Mar 14, 2023 at 2:58 AM Hangbin Liu <liuhangbin@...il.com> wrote:
>
> 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@...il.com>
Acked-by: Jamal Hadi Salim <jhs@...atatu.com>
cheers,
jamal
> ---
> 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
>
Powered by blists - more mailing lists