Commit ec1a9cca authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

net: sched: remove check for number of actions in tcf_exts_exec 



Leave it to tcf_action_exec to return TC_ACT_OK in case there is no
action present.

Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent af089e70

include/net/pkt_cls.h

+1 −3
Original line number Diff line number Diff line
@@ -192,9 +192,7 @@ tcf_exts_exec(struct sk_buff *skb, struct tcf_exts *exts, 
	      struct tcf_result *res)

{

#ifdef CONFIG_NET_CLS_ACT

	if (tcf_exts_has_actions(exts))

		return tcf_action_exec(skb, exts->actions, exts->nr_actions,

				       res);

	return tcf_action_exec(skb, exts->actions, exts->nr_actions, res);

#endif

	return TC_ACT_OK;

}

net/sched/act_api.c

+2 −1
Original line number Diff line number Diff line
@@ -473,9 +473,10 @@ static struct tc_action_ops *tc_lookup_action(struct nlattr *kind) 
int tcf_action_exec(struct sk_buff *skb, struct tc_action **actions,

		    int nr_actions, struct tcf_result *res)

{

	int ret = -1, i;

	u32 jmp_prgcnt = 0;

	u32 jmp_ttl = TCA_ACT_MAX_PRIO; /*matches actions per filter */

	int i;

	int ret = TC_ACT_OK;



	if (skb_skip_tc_classify(skb))

		return TC_ACT_OK;