aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJiri Pirko <jiri@mellanox.com>2017-08-04 14:29:02 +0200
committerDavid S. Miller <davem@davemloft.net>2017-08-04 11:21:23 -0700
commitec1a9cca0e13391167567964fd04e61a39d6a4ae (patch)
treed502ea3859f4730243a5913bebf98a38893dc31b /net
parentnet: sched: fix return value of tcf_exts_exec (diff)
downloadlinux-dev-ec1a9cca0e13391167567964fd04e61a39d6a4ae.tar.xz
linux-dev-ec1a9cca0e13391167567964fd04e61a39d6a4ae.zip
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: Jiri Pirko <jiri@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/sched/act_api.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index f19b118df414..a2915d958279 100644
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -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;