Commit 8de2bd02 authored by Hangbin Liu's avatar Hangbin Liu Committed by Jakub Kicinski
Browse files

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



This reverts commit 923b2e30.

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: default avatarHangbin Liu <liuhangbin@gmail.com>
Acked-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 5ae06327

net/sched/act_api.c

+2 −2
Original line number Diff line number Diff line
@@ -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;