aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/bluetooth
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-04-24 13:54:56 -0400
committerDavid S. Miller <davem@davemloft.net>2011-04-24 13:54:56 -0400
commit2a9e9507011440a57d6356ded630ba0c0f5d4b77 (patch)
tree0c6c99b350f69f82ca9a2f602b075f1126d5b2b2 /include/net/bluetooth
parentb71d1d426d263b0b6cb5760322efebbfc89d4463 (diff)
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/bluetooth')
-rw-r--r--include/net/bluetooth/hci.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 6138e313d175..499b7b7c7c9a 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -1067,7 +1067,6 @@ struct hci_sco_hdr {
1067 __u8 dlen; 1067 __u8 dlen;
1068} __packed; 1068} __packed;
1069 1069
1070#ifdef __KERNEL__
1071#include <linux/skbuff.h> 1070#include <linux/skbuff.h>
1072static inline struct hci_event_hdr *hci_event_hdr(const struct sk_buff *skb) 1071static inline struct hci_event_hdr *hci_event_hdr(const struct sk_buff *skb)
1073{ 1072{
@@ -1083,7 +1082,6 @@ static inline struct hci_sco_hdr *hci_sco_hdr(const struct sk_buff *skb)
1083{ 1082{
1084 return (struct hci_sco_hdr *) skb->data; 1083 return (struct hci_sco_hdr *) skb->data;
1085} 1084}
1086#endif
1087 1085
1088/* Command opcode pack/unpack */ 1086/* Command opcode pack/unpack */
1089#define hci_opcode_pack(ogf, ocf) (__u16) ((ocf & 0x03ff)|(ogf << 10)) 1087#define hci_opcode_pack(ogf, ocf) (__u16) ((ocf & 0x03ff)|(ogf << 10))