diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-19 21:45:20 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-19 21:45:20 +0100 |
| commit | 927606a17e802fcf0c9ee82a74bc444b84726e67 (patch) | |
| tree | b1aef00e333a9678448e11863da2572a7bb16db6 /include | |
| parent | net: Make GRETH driver depend on SPARC. (diff) | |
| parent | netfilter: nf_queue: fix NF_STOLEN skb leak (diff) | |
| download | linux-927606a17e802fcf0c9ee82a74bc444b84726e67.tar.xz linux-927606a17e802fcf0c9ee82a74bc444b84726e67.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netfilter.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h index 70079454ffd0..89341c32631a 100644 --- a/include/linux/netfilter.h +++ b/include/linux/netfilter.h @@ -212,8 +212,9 @@ NF_HOOK_COND(uint8_t pf, unsigned int hook, struct sk_buff *skb, struct net_device *in, struct net_device *out, int (*okfn)(struct sk_buff *), bool cond) { - int ret = 1; - if (cond || + int ret; + + if (!cond || (ret = nf_hook_thresh(pf, hook, skb, in, out, okfn, INT_MIN) == 1)) ret = okfn(skb); return ret; |