summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-11-12 11:04:26 -0800
committerDavid S. Miller <davem@davemloft.net>2010-11-12 11:04:26 -0800
commit7c13a0d9a1ac6875f6380763b947f4a5a016605f (patch)
treefbf7b41bc8cc250e6f9add13541e7d1c408a33b8 /include/linux
parent369cf77a6a3e41b1110506ddf43d45804103bfde (diff)
parent22e091e5253da1e9ad7c0a82c2c84446fc403efe (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/netfilter.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index 89341c32631..03317c8d407 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;
}