[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>

diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 10a3eec..41456c1 100644 (file)
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -739,13 +739,13 @@ struct sockaddr_hci {
 struct hci_filter {
        unsigned long type_mask;
        unsigned long event_mask[2];
-       __u16   opcode;
+       __le16   opcode;
 };
 
 struct hci_ufilter {
        __u32   type_mask;
        __u32   event_mask[2];
-       __u16   opcode;
+       __le16   opcode;
 };
 
 #define HCI_FLT_TYPE_BITS      31

diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index 711a085..dbf98c4 100644 (file)
--- 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)
                        if (flt->opcode &&
                            ((evt == HCI_EV_CMD_COMPLETE &&
                              flt->opcode !=
-                             get_unaligned((__u16 *)(skb->data + 3))) ||
+                             get_unaligned((__le16 *)(skb->data + 3))) ||
                             (evt == HCI_EV_CMD_STATUS &&
                              flt->opcode !=
-                             get_unaligned((__u16 *)(skb->data + 4)))))
+                             get_unaligned((__le16 *)(skb->data + 4)))))
                                continue;
                }