diff options
| author | David S. Miller <davem@davemloft.net> | 2010-11-12 14:04:26 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-12 14:04:26 -0500 |
| commit | 7c13a0d9a1ac6875f6380763b947f4a5a016605f (patch) | |
| tree | fbf7b41bc8cc250e6f9add13541e7d1c408a33b8 /include | |
| parent | 369cf77a6a3e41b1110506ddf43d45804103bfde (diff) | |
| parent | 22e091e5253da1e9ad7c0a82c2c84446fc403efe (diff) | |
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, | |||
| 215 | int ret; | 215 | int ret; |
| 216 | 216 | ||
| 217 | if (!cond || | 217 | if (!cond || |
| 218 | (ret = nf_hook_thresh(pf, hook, skb, in, out, okfn, INT_MIN) == 1)) | 218 | ((ret = nf_hook_thresh(pf, hook, skb, in, out, okfn, INT_MIN)) == 1)) |
| 219 | ret = okfn(skb); | 219 | ret = okfn(skb); |
| 220 | return ret; | 220 | return ret; |
| 221 | } | 221 | } |