git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
nsproxy: remove INIT_NSPROXY()
[safe/jmp/linux-2.6]
/
include
/
linux
/
netfilter.h
diff --git
a/include/linux/netfilter.h
b/include/linux/netfilter.h
index
7007945
..
89341c3
100644
(file)
--- 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;