diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-19 15:45:20 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-19 15:45:20 -0500 |
| commit | 927606a17e802fcf0c9ee82a74bc444b84726e67 (patch) | |
| tree | b1aef00e333a9678448e11863da2572a7bb16db6 /include | |
| parent | cf261b2392daa7b1a18b91707485e3648dda34d3 (diff) | |
| parent | 64507fdbc29c3a622180378210ecea8659b14e40 (diff) | |
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, | |||
| 212 | struct net_device *in, struct net_device *out, | 212 | struct net_device *in, struct net_device *out, |
| 213 | int (*okfn)(struct sk_buff *), bool cond) | 213 | int (*okfn)(struct sk_buff *), bool cond) |
| 214 | { | 214 | { |
| 215 | int ret = 1; | 215 | int ret; |
| 216 | if (cond || | 216 | |
| 217 | if (!cond || | ||
| 217 | (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)) |
| 218 | ret = okfn(skb); | 219 | ret = okfn(skb); |
| 219 | return ret; | 220 | return ret; |