Merge tag 'pwm/for-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...

[cascardo/linux.git] / net / bluetooth / hci_request.c

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);