diff options
| author | David S. Miller <davem@davemloft.net> | 2010-11-12 20:04:26 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-12 20:04:26 +0100 |
| commit | 7c13a0d9a1ac6875f6380763b947f4a5a016605f (patch) | |
| tree | fbf7b41bc8cc250e6f9add13541e7d1c408a33b8 /include | |
| parent | rtnetlink: Fix message size calculation for link messages (diff) | |
| parent | netfilter: ipv6: fix overlap check for fragments (diff) | |
| download | linux-7c13a0d9a1ac6875f6380763b947f4a5a016605f.tar.xz linux-7c13a0d9a1ac6875f6380763b947f4a5a016605f.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netfilter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h index 89341c32631a..03317c8d4077 100644 --- a/include/linux/netfilter.h +++ b/include/linux/netfilter.h @@ -215,7 +215,7 @@ NF_HOOK_COND(uint8_t pf, unsigned int hook, struct sk_buff *skb, int ret; if (!cond || - (ret = nf_hook_thresh(pf, hook, skb, in, out, okfn, INT_MIN) == 1)) + ((ret = nf_hook_thresh(pf, hook, skb, in, out, okfn, INT_MIN)) == 1)) ret = okfn(skb); return ret; } |