Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Hangbin Liu and committed by
Jakub Kicinski
8de2bd02 5ae06327

+2 -2
+2 -2
net/sched/act_api.c
··· 1596 1596 if (tcf_action_dump(skb, actions, bind, ref, false) < 0) 1597 1597 goto out_nlmsg_trim; 1598 1598 1599 + nla_nest_end(skb, nest); 1600 + 1599 1601 if (extack && extack->_msg && 1600 1602 nla_put_string(skb, TCA_EXT_WARN_MSG, extack->_msg)) 1601 1603 goto out_nlmsg_trim; 1602 - 1603 - nla_nest_end(skb, nest); 1604 1604 1605 1605 nlh->nlmsg_len = skb_tail_pointer(skb) - b; 1606 1606