aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/netfilter/nf_conntrack.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-04-24 10:54:56 -0700
committerDavid S. Miller <davem@davemloft.net>2011-04-24 10:54:56 -0700
commit2a9e9507011440a57d6356ded630ba0c0f5d4b77 (patch)
tree0c6c99b350f69f82ca9a2f602b075f1126d5b2b2 /include/net/netfilter/nf_conntrack.h
parentb71d1d426d263b0b6cb5760322efebbfc89d4463 (diff)
downloadlinux-2a9e9507011440a57d6356ded630ba0c0f5d4b77.tar.gz
net: Remove __KERNEL__ cpp checks from include/net
These header files are never installed to user consumption, so any __KERNEL__ cpp checks are superfluous. Projects should also not copy these files into their userland utility sources and try to use them there. If they insist on doing so, the onus is on them to sanitize the headers as needed. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/netfilter/nf_conntrack.h')
-rw-r--r--include/net/netfilter/nf_conntrack.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index d0d13378991e5..c7c42e7acc310 100644
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -14,7 +14,6 @@
#include <linux/netfilter/nf_conntrack_common.h>
-#ifdef __KERNEL__
#include <linux/bitops.h>
#include <linux/compiler.h>
#include <asm/atomic.h>
@@ -326,5 +325,4 @@ do { \
#define MODULE_ALIAS_NFCT_HELPER(helper) \
MODULE_ALIAS("nfct-helper-" helper)
-#endif /* __KERNEL__ */
#endif /* _NF_CONNTRACK_H */