diff --git a/[refs] b/[refs] index 52cc8dd4680c..d9e3fcdf81d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aabc9761b69f1bfa30a78f7005be95cc9cc06175 +refs/heads/master: 14d50e78f947d340066ee0465dd892ad1d9162c0 diff --git a/trunk/net/sched/act_api.c b/trunk/net/sched/act_api.c index 5e6cc371b39e..cafcb084098d 100644 --- a/trunk/net/sched/act_api.c +++ b/trunk/net/sched/act_api.c @@ -171,10 +171,10 @@ int tcf_action_exec(struct sk_buff *skb, struct tc_action *act, skb->tc_verd = SET_TC_OK2MUNGE(skb->tc_verd); skb->tc_verd = CLR_TC_MUNGED(skb->tc_verd); } - if (ret != TC_ACT_PIPE) - goto exec_done; if (ret == TC_ACT_REPEAT) goto repeat; /* we need a ttl - JHS */ + if (ret != TC_ACT_PIPE) + goto exec_done; } act = a->next; }