Commit 2a9e9507 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parent b71d1d42

include/net/addrconf.h

+0 −3
Original line number Diff line number Diff line
@@ -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

include/net/af_rxrpc.h

+0 −3
Original line number Diff line number Diff line
@@ -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 */

include/net/af_unix.h

+0 −2
Original line number Diff line number Diff line
@@ -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

include/net/atmclip.h

+0 −2
Original line number Diff line number Diff line
@@ -54,8 +54,6 @@ struct clip_priv { 
};





#ifdef __KERNEL__

extern struct neigh_table *clip_tbl_hook;

#endif



#endif

include/net/bluetooth/hci.h

+0 −2
Original line number Diff line number Diff line
@@ -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))

CRA Git | Maintained and supported by SUSTech CRA and CCSE