Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...

Johan Hedberg says:

====================
pull request: bluetooth 2016-10-08

Here are a couple of Bluetooth fixes for the 4.9 kernel:

 - Firmware download fix for Atheros controllers
 - Fixes to the content of LE scan response
 - New USB ID for a Marvell chipset

Please let me know if there are any issues pulling. Thanks.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 6bd63b8..2f633df 100644 (file)
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -314,6 +314,7 @@ static const struct usb_device_id blacklist_table[] = {
        /* Marvell Bluetooth devices */
        { USB_DEVICE(0x1286, 0x2044), .driver_info = BTUSB_MARVELL },
        { USB_DEVICE(0x1286, 0x2046), .driver_info = BTUSB_MARVELL },
+       { USB_DEVICE(0x1286, 0x204e), .driver_info = BTUSB_MARVELL },
 
        /* Intel Bluetooth devices */
        { USB_DEVICE(0x8087, 0x07da), .driver_info = BTUSB_CSR },
@@ -1042,6 +1043,10 @@ static int btusb_open(struct hci_dev *hdev)
 
        BT_DBG("%s", hdev->name);
 
+       err = usb_autopm_get_interface(data->intf);
+       if (err < 0)
+               return err;
+
        /* Patching USB firmware files prior to starting any URBs of HCI path
         * It is more safe to use USB bulk channel for downloading USB patch
         */
@@ -1051,10 +1056,6 @@ static int btusb_open(struct hci_dev *hdev)
                        return err;
        }
 
-       err = usb_autopm_get_interface(data->intf);
-       if (err < 0)
-               return err;
-
        data->intf->needs_remote_wakeup = 1;
 
        if (test_and_set_bit(BTUSB_INTR_RUNNING, &data->flags))

diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c
index c813568..e228842 100644 (file)
--- a/net/bluetooth/hci_request.c
+++ b/net/bluetooth/hci_request.c
@@ -21,8 +21,6 @@
    SOFTWARE IS DISCLAIMED.
 */
 
-#include <asm/unaligned.h>
-
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
 #include <net/bluetooth/mgmt.h>
@@ -973,33 +971,58 @@ void __hci_req_enable_advertising(struct hci_request *req)
 
 static u8 append_local_name(struct hci_dev *hdev, u8 *ptr, u8 ad_len)
 {
-       size_t name_len;
+       size_t complete_len;
+       size_t short_len;
        int max_len;
 
        max_len = HCI_MAX_AD_LENGTH - ad_len - 2;
-       name_len = strlen(hdev->dev_name);
-       if (name_len > 0 && max_len > 0) {
-
-               if (name_len > max_len) {
-                       name_len = max_len;
-                       ptr[1] = EIR_NAME_SHORT;
-               } else
-                       ptr[1] = EIR_NAME_COMPLETE;
-
-               ptr[0] = name_len + 1;
+       complete_len = strlen(hdev->dev_name);
+       short_len = strlen(hdev->short_name);
+
+       /* no space left for name */
+       if (max_len < 1)
+               return ad_len;
+
+       /* no name set */
+       if (!complete_len)
+               return ad_len;
+
+       /* complete name fits and is eq to max short name len or smaller */
+       if (complete_len <= max_len &&
+           complete_len <= HCI_MAX_SHORT_NAME_LENGTH) {
+               return eir_append_data(ptr, ad_len, EIR_NAME_COMPLETE,
+                                      hdev->dev_name, complete_len);
+       }
 
-               memcpy(ptr + 2, hdev->dev_name, name_len);
+       /* short name set and fits */
+       if (short_len && short_len <= max_len) {
+               return eir_append_data(ptr, ad_len, EIR_NAME_SHORT,
+                                      hdev->short_name, short_len);
+       }
 
-               ad_len += (name_len + 2);
-               ptr += (name_len + 2);
+       /* no short name set so shorten complete name */
+       if (!short_len) {
+               return eir_append_data(ptr, ad_len, EIR_NAME_SHORT,
+                                      hdev->dev_name, max_len);
        }
 
        return ad_len;
 }
 
+static u8 append_appearance(struct hci_dev *hdev, u8 *ptr, u8 ad_len)
+{
+       return eir_append_le16(ptr, ad_len, EIR_APPEARANCE, hdev->appearance);
+}
+
 static u8 create_default_scan_rsp_data(struct hci_dev *hdev, u8 *ptr)
 {
-       return append_local_name(hdev, ptr, 0);
+       u8 scan_rsp_len = 0;
+
+       if (hdev->appearance) {
+               scan_rsp_len = append_appearance(hdev, ptr, scan_rsp_len);
+       }
+
+       return append_local_name(hdev, ptr, scan_rsp_len);
 }
 
 static u8 create_instance_scan_rsp_data(struct hci_dev *hdev, u8 instance,
@@ -1016,18 +1039,13 @@ static u8 create_instance_scan_rsp_data(struct hci_dev *hdev, u8 instance,
        instance_flags = adv_instance->flags;
 
        if ((instance_flags & MGMT_ADV_FLAG_APPEARANCE) && hdev->appearance) {
-               ptr[0] = 3;
-               ptr[1] = EIR_APPEARANCE;
-               put_unaligned_le16(hdev->appearance, ptr + 2);
-               scan_rsp_len += 4;
-               ptr += 4;
+               scan_rsp_len = append_appearance(hdev, ptr, scan_rsp_len);
        }
 
-       memcpy(ptr, adv_instance->scan_rsp_data,
+       memcpy(&ptr[scan_rsp_len], adv_instance->scan_rsp_data,
               adv_instance->scan_rsp_len);
 
        scan_rsp_len += adv_instance->scan_rsp_len;
-       ptr += adv_instance->scan_rsp_len;
 
        if (instance_flags & MGMT_ADV_FLAG_LOCAL_NAME)
                scan_rsp_len = append_local_name(hdev, ptr, scan_rsp_len);

diff --git a/net/bluetooth/hci_request.h b/net/bluetooth/hci_request.h
index ac1e110..6b06629 100644 (file)
--- a/net/bluetooth/hci_request.h
+++ b/net/bluetooth/hci_request.h
@@ -20,6 +20,8 @@
    SOFTWARE IS DISCLAIMED.
 */
 
+#include <asm/unaligned.h>
+
 #define hci_req_sync_lock(hdev)   mutex_lock(&hdev->req_lock)
 #define hci_req_sync_unlock(hdev) mutex_unlock(&hdev->req_lock)
 
@@ -103,3 +105,24 @@ static inline void hci_update_background_scan(struct hci_dev *hdev)
 
 void hci_request_setup(struct hci_dev *hdev);
 void hci_request_cancel_all(struct hci_dev *hdev);
+
+static inline u16 eir_append_data(u8 *eir, u16 eir_len, u8 type,
+                                 u8 *data, u8 data_len)
+{
+       eir[eir_len++] = sizeof(type) + data_len;
+       eir[eir_len++] = type;
+       memcpy(&eir[eir_len], data, data_len);
+       eir_len += data_len;
+
+       return eir_len;
+}
+
+static inline u16 eir_append_le16(u8 *eir, u16 eir_len, u8 type, u16 data)
+{
+       eir[eir_len++] = sizeof(type) + sizeof(data);
+       eir[eir_len++] = type;
+       put_unaligned_le16(data, &eir[eir_len]);
+       eir_len += sizeof(data);
+
+       return eir_len;
+}

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 19b8a5e..7360380 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -867,27 +867,6 @@ static int read_controller_info(struct sock *sk, struct hci_dev *hdev,
                                 sizeof(rp));
 }
 
-static inline u16 eir_append_data(u8 *eir, u16 eir_len, u8 type, u8 *data,
-                                 u8 data_len)
-{
-       eir[eir_len++] = sizeof(type) + data_len;
-       eir[eir_len++] = type;
-       memcpy(&eir[eir_len], data, data_len);
-       eir_len += data_len;
-
-       return eir_len;
-}
-
-static inline u16 eir_append_le16(u8 *eir, u16 eir_len, u8 type, u16 data)
-{
-       eir[eir_len++] = sizeof(type) + sizeof(data);
-       eir[eir_len++] = type;
-       put_unaligned_le16(data, &eir[eir_len]);
-       eir_len += sizeof(data);
-
-       return eir_len;
-}
-
 static u16 append_eir_data_to_buf(struct hci_dev *hdev, u8 *eir)
 {
        u16 eir_len = 0;