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>
This commit is contained in:
David S. Miller
parent
b71d1d426d
commit
2a9e950701
|
|
@ -42,8 +42,6 @@ struct prefix_info {
|
|||
};
|
||||
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#include <linux/netdevice.h>
|
||||
#include <net/if_inet6.h>
|
||||
#include <net/ipv6.h>
|
||||
|
|
@ -285,4 +283,3 @@ extern void if6_proc_exit(void);
|
|||
#endif
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -12,8 +12,6 @@
|
|||
#ifndef _NET_RXRPC_H
|
||||
#define _NET_RXRPC_H
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#include <linux/rxrpc.h>
|
||||
|
||||
struct rxrpc_call;
|
||||
|
|
@ -53,5 +51,4 @@ extern struct rxrpc_call *rxrpc_kernel_accept_call(struct socket *,
|
|||
unsigned long);
|
||||
extern int rxrpc_kernel_reject_call(struct socket *);
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
#endif /* _NET_RXRPC_H */
|
||||
|
|
|
|||
|
|
@ -41,7 +41,6 @@ struct unix_skb_parms {
|
|||
spin_lock_nested(&unix_sk(s)->lock, \
|
||||
SINGLE_DEPTH_NESTING)
|
||||
|
||||
#ifdef __KERNEL__
|
||||
/* The AF_UNIX socket */
|
||||
struct unix_sock {
|
||||
/* WARNING: sk has to be the first member */
|
||||
|
|
@ -72,4 +71,3 @@ static inline int unix_sysctl_register(struct net *net) { return 0; }
|
|||
static inline void unix_sysctl_unregister(struct net *net) {}
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -54,8 +54,6 @@ struct clip_priv {
|
|||
};
|
||||
|
||||
|
||||
#ifdef __KERNEL__
|
||||
extern struct neigh_table *clip_tbl_hook;
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1067,7 +1067,6 @@ struct hci_sco_hdr {
|
|||
__u8 dlen;
|
||||
} __packed;
|
||||
|
||||
#ifdef __KERNEL__
|
||||
#include <linux/skbuff.h>
|
||||
static inline struct hci_event_hdr *hci_event_hdr(const struct sk_buff *skb)
|
||||
{
|
||||
|
|
@ -1083,7 +1082,6 @@ static inline struct hci_sco_hdr *hci_sco_hdr(const struct sk_buff *skb)
|
|||
{
|
||||
return (struct hci_sco_hdr *) skb->data;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Command opcode pack/unpack */
|
||||
#define hci_opcode_pack(ogf, ocf) (__u16) ((ocf & 0x03ff)|(ogf << 10))
|
||||
|
|
|
|||
|
|
@ -92,8 +92,6 @@ struct dst_entry {
|
|||
};
|
||||
};
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
extern u32 *dst_cow_metrics_generic(struct dst_entry *dst, unsigned long old);
|
||||
extern const u32 dst_default_metrics[RTAX_MAX];
|
||||
|
||||
|
|
@ -438,6 +436,5 @@ extern struct dst_entry *xfrm_lookup(struct net *net, struct dst_entry *dst_orig
|
|||
const struct flowi *fl, struct sock *sk,
|
||||
int flags);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#endif /* _NET_DST_H */
|
||||
|
|
|
|||
|
|
@ -30,8 +30,6 @@
|
|||
#define IF_PREFIX_ONLINK 0x01
|
||||
#define IF_PREFIX_AUTOCONF 0x02
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
enum {
|
||||
INET6_IFADDR_STATE_DAD,
|
||||
INET6_IFADDR_STATE_POSTDAD,
|
||||
|
|
@ -303,4 +301,3 @@ static inline int ipv6_ipgre_mc_map(const struct in6_addr *addr,
|
|||
}
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -13,8 +13,6 @@
|
|||
#ifndef _IP6_FIB_H
|
||||
#define _IP6_FIB_H
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#include <linux/ipv6_route.h>
|
||||
#include <linux/rtnetlink.h>
|
||||
#include <linux/spinlock.h>
|
||||
|
|
@ -240,4 +238,3 @@ static inline void fib6_rules_cleanup(void)
|
|||
}
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -21,8 +21,6 @@ struct route_info {
|
|||
__u8 prefix[0]; /* 0,8 or 16 */
|
||||
};
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#include <net/flow.h>
|
||||
#include <net/ip6_fib.h>
|
||||
#include <net/sock.h>
|
||||
|
|
@ -193,4 +191,3 @@ static inline int ip6_skb_dst_mtu(struct sk_buff *skb)
|
|||
}
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -8,9 +8,6 @@
|
|||
|
||||
#include <linux/ip_vs.h> /* definitions shared with userland */
|
||||
|
||||
/* old ipvsadm versions still include this file directly */
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#include <asm/types.h> /* for __uXX types */
|
||||
|
||||
#include <linux/sysctl.h> /* for ctl_path */
|
||||
|
|
@ -1415,6 +1412,4 @@ ip_vs_dest_conn_overhead(struct ip_vs_dest *dest)
|
|||
atomic_read(&dest->inactconns);
|
||||
}
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
#endif /* _NET_IP_VS_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 */
|
||||
|
|
|
|||
|
|
@ -80,7 +80,6 @@ struct ipx_route {
|
|||
atomic_t refcnt;
|
||||
};
|
||||
|
||||
#ifdef __KERNEL__
|
||||
struct ipx_cb {
|
||||
u8 ipx_tctrl;
|
||||
__be32 ipx_dest_net;
|
||||
|
|
@ -116,7 +115,6 @@ static inline struct ipx_sock *ipx_sk(struct sock *sk)
|
|||
}
|
||||
|
||||
#define IPX_SKB_CB(__skb) ((struct ipx_cb *)&((__skb)->cb[0]))
|
||||
#endif
|
||||
|
||||
#define IPX_MIN_EPHEMERAL_SOCKET 0x4000
|
||||
#define IPX_MAX_EPHEMERAL_SOCKET 0x7fff
|
||||
|
|
|
|||
|
|
@ -42,8 +42,6 @@ enum {
|
|||
#define ND_REACHABLE_TIME (30*HZ)
|
||||
#define ND_RETRANS_TIMER HZ
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#include <linux/compiler.h>
|
||||
#include <linux/icmpv6.h>
|
||||
#include <linux/in6.h>
|
||||
|
|
@ -156,8 +154,4 @@ static inline struct neighbour * ndisc_get_neigh(struct net_device *dev, const s
|
|||
return ERR_PTR(-ENODEV);
|
||||
}
|
||||
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
*
|
||||
* Changes:
|
||||
*/
|
||||
#ifdef __KERNEL__
|
||||
|
||||
struct dst_entry;
|
||||
|
||||
|
|
@ -29,4 +28,3 @@ extern int unregister_netevent_notifier(struct notifier_block *nb);
|
|||
extern int call_netevent_notifiers(unsigned long val, void *v);
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -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 */
|
||||
|
|
|
|||
|
|
@ -104,8 +104,6 @@ struct nf_conntrack_tuple_mask {
|
|||
} src;
|
||||
};
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
static inline void nf_ct_dump_tuple_ip(const struct nf_conntrack_tuple *t)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
|
|
@ -148,8 +146,6 @@ struct nf_conntrack_tuple_hash {
|
|||
struct nf_conntrack_tuple tuple;
|
||||
};
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
static inline bool __nf_ct_tuple_src_equal(const struct nf_conntrack_tuple *t1,
|
||||
const struct nf_conntrack_tuple *t2)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -48,7 +48,6 @@ struct nf_nat_multi_range_compat {
|
|||
struct nf_nat_range range[1];
|
||||
};
|
||||
|
||||
#ifdef __KERNEL__
|
||||
#include <linux/list.h>
|
||||
#include <linux/netfilter/nf_conntrack_pptp.h>
|
||||
#include <net/netfilter/nf_conntrack_extend.h>
|
||||
|
|
@ -93,7 +92,4 @@ static inline struct nf_conn_nat *nfct_nat(const struct nf_conn *ct)
|
|||
#endif
|
||||
}
|
||||
|
||||
#else /* !__KERNEL__: iptables wants this to compile. */
|
||||
#define nf_nat_multi_range nf_nat_multi_range_compat
|
||||
#endif /*__KERNEL__*/
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
#ifndef _NET_RAWV6_H
|
||||
#define _NET_RAWV6_H
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#include <net/protocol.h>
|
||||
|
||||
void raw6_icmp_error(struct sk_buff *, int nexthdr,
|
||||
|
|
@ -20,5 +18,3 @@ int rawv6_mh_filter_unregister(int (*filter)(struct sock *sock,
|
|||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -35,10 +35,6 @@
|
|||
#include <linux/cache.h>
|
||||
#include <linux/security.h>
|
||||
|
||||
#ifndef __KERNEL__
|
||||
#warning This file is not supposed to be used outside of kernel.
|
||||
#endif
|
||||
|
||||
#define RTO_ONLINK 0x01
|
||||
|
||||
#define RTO_CONN 0
|
||||
|
|
|
|||
|
|
@ -7,8 +7,6 @@
|
|||
* IPv6 transport protocols
|
||||
*/
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
extern struct proto rawv6_prot;
|
||||
extern struct proto udpv6_prot;
|
||||
extern struct proto udplitev6_prot;
|
||||
|
|
@ -57,5 +55,3 @@ extern const struct inet_connection_sock_af_ops ipv4_specific;
|
|||
extern void inet6_destroy_sock(struct sock *sk);
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -250,7 +250,6 @@
|
|||
|
||||
#ifndef __NET__WIMAX_H__
|
||||
#define __NET__WIMAX_H__
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#include <linux/wimax.h>
|
||||
#include <net/genetlink.h>
|
||||
|
|
@ -518,8 +517,4 @@ extern ssize_t wimax_msg_len(struct sk_buff *);
|
|||
extern int wimax_rfkill(struct wimax_dev *, enum wimax_rf_state);
|
||||
extern int wimax_reset(struct wimax_dev *);
|
||||
|
||||
#else
|
||||
/* You might be looking for linux/wimax.h */
|
||||
#error This file should not be included from user space.
|
||||
#endif /* #ifdef __KERNEL__ */
|
||||
#endif /* #ifndef __NET__WIMAX_H__ */
|
||||
|
|
|
|||
Reference in New Issue