diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-03 20:24:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-03 20:24:08 -0400 |
| commit | 8800cea62025a5209d110c5fa5990429239d6eee (patch) | |
| tree | 2aa9e4732d7014dcda4c0e80d2e377f52e2262e9 /net/sched/act_api.c | |
| parent | 84e48b6d64fdc29586bc7d9329f986cdae591a80 (diff) | |
| parent | 14d50e78f947d340066ee0465dd892ad1d9162c0 (diff) | |
Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git/
Diffstat (limited to 'net/sched/act_api.c')
| -rw-r--r-- | net/sched/act_api.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/act_api.c b/net/sched/act_api.c index 5e6cc371b39e..cafcb084098d 100644 --- a/net/sched/act_api.c +++ b/net/sched/act_api.c | |||
| @@ -171,10 +171,10 @@ repeat: | |||
| 171 | skb->tc_verd = SET_TC_OK2MUNGE(skb->tc_verd); | 171 | skb->tc_verd = SET_TC_OK2MUNGE(skb->tc_verd); |
| 172 | skb->tc_verd = CLR_TC_MUNGED(skb->tc_verd); | 172 | skb->tc_verd = CLR_TC_MUNGED(skb->tc_verd); |
| 173 | } | 173 | } |
| 174 | if (ret != TC_ACT_PIPE) | ||
| 175 | goto exec_done; | ||
| 176 | if (ret == TC_ACT_REPEAT) | 174 | if (ret == TC_ACT_REPEAT) |
| 177 | goto repeat; /* we need a ttl - JHS */ | 175 | goto repeat; /* we need a ttl - JHS */ |
| 176 | if (ret != TC_ACT_PIPE) | ||
| 177 | goto exec_done; | ||
| 178 | } | 178 | } |
| 179 | act = a->next; | 179 | act = a->next; |
| 180 | } | 180 | } |
