Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
This commit is contained in:
commit
af756e9d88
@ -133,6 +133,7 @@ unsigned int nf_iterate(struct list_head *head,
|
|||||||
|
|
||||||
/* Optimization: we don't need to hold module
|
/* Optimization: we don't need to hold module
|
||||||
reference here, since function can't sleep. --RR */
|
reference here, since function can't sleep. --RR */
|
||||||
|
repeat:
|
||||||
verdict = elem->hook(hook, skb, indev, outdev, okfn);
|
verdict = elem->hook(hook, skb, indev, outdev, okfn);
|
||||||
if (verdict != NF_ACCEPT) {
|
if (verdict != NF_ACCEPT) {
|
||||||
#ifdef CONFIG_NETFILTER_DEBUG
|
#ifdef CONFIG_NETFILTER_DEBUG
|
||||||
@ -145,7 +146,7 @@ unsigned int nf_iterate(struct list_head *head,
|
|||||||
#endif
|
#endif
|
||||||
if (verdict != NF_REPEAT)
|
if (verdict != NF_REPEAT)
|
||||||
return verdict;
|
return verdict;
|
||||||
*i = (*i)->prev;
|
goto repeat;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return NF_ACCEPT;
|
return NF_ACCEPT;
|
||||||
|
Loading…
Reference in New Issue
Block a user