diff options
| author |   David S. Miller <davem@davemloft.net> | 2011-02-14 11:16:12 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-14 11:16:12 -0800 |
| commit | af756e9d8873efc8b0565c06734ef12d9b652061 (patch) | |
| tree | 5e1f93a9fd46a9939cb5f7d937f173f9ccf41b48 /net | |
| parent | pch_gbe: Fix the issue that the receiving data is not normal. (diff) | |
| parent | netfilter: nf_iterate: fix incorrect RCU usage (diff) | |
| download | linux-dev-af756e9d8873efc8b0565c06734ef12d9b652061.tar.xz linux-dev-af756e9d8873efc8b0565c06734ef12d9b652061.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/netfilter/core.c b/net/netfilter/core.c index 32fcbe290c04..4aa614b8a96a 100644 --- a/net/netfilter/core.c +++ b/net/netfilter/core.c @@ -133,6 +133,7 @@ unsigned int nf_iterate(struct list_head *head, /* Optimization: we don't need to hold module reference here, since function can't sleep. --RR */ +repeat: verdict = elem->hook(hook, skb, indev, outdev, okfn); if (verdict != NF_ACCEPT) { #ifdef CONFIG_NETFILTER_DEBUG @@ -145,7 +146,7 @@ unsigned int nf_iterate(struct list_head *head, #endif if (verdict != NF_REPEAT) return verdict; - *i = (*i)->prev; + goto repeat; } } return NF_ACCEPT; |