diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-12-13 03:35:01 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-13 12:05:52 -0500 |
commit | 905f3ed62515f233fea09dc5ad68bbcff4903520 (patch) | |
tree | 3ebd0793db6978a37c9e40761b090b179cca9116 | |
parent | db71b7f19c3ddc8897437e655130f9010f9a9b72 (diff) |
[PATCH] hci endianness annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | include/net/bluetooth/hci.h | 4 | ||||
-rw-r--r-- | net/bluetooth/hci_sock.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index 10a3eec191fd..41456c148842 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h | |||
@@ -739,13 +739,13 @@ struct sockaddr_hci { | |||
739 | struct hci_filter { | 739 | struct hci_filter { |
740 | unsigned long type_mask; | 740 | unsigned long type_mask; |
741 | unsigned long event_mask[2]; | 741 | unsigned long event_mask[2]; |
742 | __u16 opcode; | 742 | __le16 opcode; |
743 | }; | 743 | }; |
744 | 744 | ||
745 | struct hci_ufilter { | 745 | struct hci_ufilter { |
746 | __u32 type_mask; | 746 | __u32 type_mask; |
747 | __u32 event_mask[2]; | 747 | __u32 event_mask[2]; |
748 | __u16 opcode; | 748 | __le16 opcode; |
749 | }; | 749 | }; |
750 | 750 | ||
751 | #define HCI_FLT_TYPE_BITS 31 | 751 | #define HCI_FLT_TYPE_BITS 31 |
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c index 711a085eca5b..dbf98c49dbaa 100644 --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c | |||
@@ -123,10 +123,10 @@ void hci_send_to_sock(struct hci_dev *hdev, struct sk_buff *skb) | |||
123 | if (flt->opcode && | 123 | if (flt->opcode && |
124 | ((evt == HCI_EV_CMD_COMPLETE && | 124 | ((evt == HCI_EV_CMD_COMPLETE && |
125 | flt->opcode != | 125 | flt->opcode != |
126 | get_unaligned((__u16 *)(skb->data + 3))) || | 126 | get_unaligned((__le16 *)(skb->data + 3))) || |
127 | (evt == HCI_EV_CMD_STATUS && | 127 | (evt == HCI_EV_CMD_STATUS && |
128 | flt->opcode != | 128 | flt->opcode != |
129 | get_unaligned((__u16 *)(skb->data + 4))))) | 129 | get_unaligned((__le16 *)(skb->data + 4))))) |
130 | continue; | 130 | continue; |
131 | } | 131 | } |
132 | 132 | ||