diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-24 19:54:56 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-24 19:54:56 +0200 |
| commit | 2a9e9507011440a57d6356ded630ba0c0f5d4b77 (patch) | |
| tree | 0c6c99b350f69f82ca9a2f602b075f1126d5b2b2 /include/net/ipv6.h | |
| parent | inet: constify ip headers and in6_addr (diff) | |
| download | linux-2a9e9507011440a57d6356ded630ba0c0f5d4b77.tar.xz linux-2a9e9507011440a57d6356ded630ba0c0f5d4b77.zip | |
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/ipv6.h')
| -rw-r--r-- | include/net/ipv6.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index 5da192653153..e1c60b43e73b 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -77,11 +77,9 @@ /* * Addr scopes */ -#ifdef __KERNEL__ #define IPV6_ADDR_MC_SCOPE(a) \ ((a)->s6_addr[1] & 0x0f) /* nonstandard */ #define __IPV6_ADDR_SCOPE_INVALID -1 -#endif #define IPV6_ADDR_SCOPE_NODELOCAL 0x01 #define IPV6_ADDR_SCOPE_LINKLOCAL 0x02 #define IPV6_ADDR_SCOPE_SITELOCAL 0x05 @@ -91,14 +89,12 @@ /* * Addr flags */ -#ifdef __KERNEL__ #define IPV6_ADDR_MC_FLAG_TRANSIENT(a) \ ((a)->s6_addr[1] & 0x10) #define IPV6_ADDR_MC_FLAG_PREFIX(a) \ ((a)->s6_addr[1] & 0x20) #define IPV6_ADDR_MC_FLAG_RENDEZVOUS(a) \ ((a)->s6_addr[1] & 0x40) -#endif /* * fragmentation header @@ -113,8 +109,6 @@ struct frag_hdr { #define IP6_MF 0x0001 -#ifdef __KERNEL__ - #include <net/sock.h> /* sysctls */ @@ -667,5 +661,4 @@ extern int ipv6_static_sysctl_register(void); extern void ipv6_static_sysctl_unregister(void); #endif -#endif /* __KERNEL__ */ #endif /* _NET_IPV6_H */ |