Bluetooth: Clean up magic pointers

Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

2 files changed, 10 insertions, 5 deletions

diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 66b26399a1ca..6127ca8bd1d1 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -979,9 +979,14 @@ struct hci_ev_role_change {
 } __packed;
 
 #define HCI_EV_NUM_COMP_PKTS            0x13
+struct hci_comp_pkts_info {
+        __le16   handle;
+        __le16   count;
+} __packed;
+
 struct hci_ev_num_comp_pkts {
         __u8     num_hndl;
-        /* variable length part */
+        struct hci_comp_pkts_info handles[0];
 } __packed;
 
 #define HCI_EV_MODE_CHANGE              0x14
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 5a204aefc035..b9d77be92d3b 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -2256,7 +2256,6 @@ static inline void hci_role_change_evt(struct hci_dev *hdev, struct sk_buff *skb
 static inline void hci_num_comp_pkts_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
         struct hci_ev_num_comp_pkts *ev = (void *) skb->data;
-        __le16 *ptr;
         int i;
 
         skb_pull(skb, sizeof(*ev));
@@ -2273,12 +2272,13 @@ static inline void hci_num_comp_pkts_evt(struct hci_dev *hdev, struct sk_buff *s
                 return;
         }
 
-        for (i = 0, ptr = (__le16 *) skb->data; i < ev->num_hndl; i++) {
+        for (i = 0; i < ev->num_hndl; i++) {
+                struct hci_comp_pkts_info *info = &ev->handles[i];
                 struct hci_conn *conn;
                 __u16  handle, count;
 
-                handle = get_unaligned_le16(ptr++);
-                count  = get_unaligned_le16(ptr++);
+                handle = __le16_to_cpu(info->handle);
+                count  = __le16_to_cpu(info->count);
 
                 conn = hci_conn_hash_lookup_handle(hdev, handle);
                 if (!conn)