Skip to content

Commit 8de2bd0

Browse files
liuhangbinkuba-moo
authored andcommitted
Revert "net/sched: act_api: move TCA_EXT_WARN_MSG to the correct hierarchy"
This reverts commit 923b2e3. 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 <[email protected]> Acked-by: Jamal Hadi Salim <[email protected]> Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 5ae0632 commit 8de2bd0

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

net/sched/act_api.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1596,12 +1596,12 @@ static int tca_get_fill(struct sk_buff *skb, struct tc_action *actions[],
15961596
if (tcf_action_dump(skb, actions, bind, ref, false) < 0)
15971597
goto out_nlmsg_trim;
15981598

1599+
nla_nest_end(skb, nest);
1600+
15991601
if (extack && extack->_msg &&
16001602
nla_put_string(skb, TCA_EXT_WARN_MSG, extack->_msg))
16011603
goto out_nlmsg_trim;
16021604

1603-
nla_nest_end(skb, nest);
1604-
16051605
nlh->nlmsg_len = skb_tail_pointer(skb) - b;
16061606

16071607
return skb->len;

0 commit comments

Comments
 (0)