From b67ef5565d579479185a3e0ff8211036c6a7c0d6 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Wed, 13 Dec 2006 00:35:01 -0800 Subject: [PATCH] --- yaml --- r: 44483 b: refs/heads/master c: 905f3ed62515f233fea09dc5ad68bbcff4903520 h: refs/heads/master i: 44481: f4de77740ee61b04d04dc4501804708e688b416a 44479: a5d0dbdab5974ac08e4084ae0978dbb545379c94 v: v3 --- [refs] | 2 +- trunk/include/net/bluetooth/hci.h | 4 ++-- trunk/net/bluetooth/hci_sock.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 7445cd045a68..19105f8678e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db71b7f19c3ddc8897437e655130f9010f9a9b72 +refs/heads/master: 905f3ed62515f233fea09dc5ad68bbcff4903520 diff --git a/trunk/include/net/bluetooth/hci.h b/trunk/include/net/bluetooth/hci.h index 10a3eec191fd..41456c148842 100644 --- a/trunk/include/net/bluetooth/hci.h +++ b/trunk/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/trunk/net/bluetooth/hci_sock.c b/trunk/net/bluetooth/hci_sock.c index 711a085eca5b..dbf98c49dbaa 100644 --- a/trunk/net/bluetooth/hci_sock.c +++ b/trunk/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; }