Merge tag 'powerpc-4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

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

diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c
index b0e23df..c813568 100644 (file)
--- a/net/bluetooth/hci_request.c
+++ b/net/bluetooth/hci_request.c
@@ -971,14 +971,14 @@ void __hci_req_enable_advertising(struct hci_request *req)
        hci_req_add(req, HCI_OP_LE_SET_ADV_ENABLE, sizeof(enable), &enable);
 }
 
-static u8 create_default_scan_rsp_data(struct hci_dev *hdev, u8 *ptr)
+static u8 append_local_name(struct hci_dev *hdev, u8 *ptr, u8 ad_len)
 {
-       u8 ad_len = 0;
        size_t name_len;
+       int max_len;
 
+       max_len = HCI_MAX_AD_LENGTH - ad_len - 2;
        name_len = strlen(hdev->dev_name);
-       if (name_len > 0) {
-               size_t max_len = HCI_MAX_AD_LENGTH - ad_len - 2;
+       if (name_len > 0 && max_len > 0) {
 
                if (name_len > max_len) {
                        name_len = max_len;
@@ -997,22 +997,42 @@ static u8 create_default_scan_rsp_data(struct hci_dev *hdev, u8 *ptr)
        return ad_len;
 }
 
+static u8 create_default_scan_rsp_data(struct hci_dev *hdev, u8 *ptr)
+{
+       return append_local_name(hdev, ptr, 0);
+}
+
 static u8 create_instance_scan_rsp_data(struct hci_dev *hdev, u8 instance,
                                        u8 *ptr)
 {
        struct adv_info *adv_instance;
+       u32 instance_flags;
+       u8 scan_rsp_len = 0;
 
        adv_instance = hci_find_adv_instance(hdev, instance);
        if (!adv_instance)
                return 0;
 
-       /* TODO: Set the appropriate entries based on advertising instance flags
-        * here once flags other than 0 are supported.
-        */
+       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;
+       }
+
        memcpy(ptr, adv_instance->scan_rsp_data,
               adv_instance->scan_rsp_len);
 
-       return 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);
+
+       return scan_rsp_len;
 }
 
 void __hci_req_update_scan_rsp_data(struct hci_request *req, u8 instance)
@@ -1194,7 +1214,7 @@ static void adv_timeout_expire(struct work_struct *work)
 
        hci_req_init(&req, hdev);
 
-       hci_req_clear_adv_instance(hdev, &req, instance, false);
+       hci_req_clear_adv_instance(hdev, NULL, &req, instance, false);
 
        if (list_empty(&hdev->adv_instances))
                __hci_req_disable_advertising(&req);
@@ -1284,8 +1304,9 @@ static void cancel_adv_timeout(struct hci_dev *hdev)
  *   setting.
  * - force == false: Only instances that have a timeout will be removed.
  */
-void hci_req_clear_adv_instance(struct hci_dev *hdev, struct hci_request *req,
-                               u8 instance, bool force)
+void hci_req_clear_adv_instance(struct hci_dev *hdev, struct sock *sk,
+                               struct hci_request *req, u8 instance,
+                               bool force)
 {
        struct adv_info *adv_instance, *n, *next_instance = NULL;
        int err;
@@ -1311,7 +1332,7 @@ void hci_req_clear_adv_instance(struct hci_dev *hdev, struct hci_request *req,
                        rem_inst = adv_instance->instance;
                        err = hci_remove_adv_instance(hdev, rem_inst);
                        if (!err)
-                               mgmt_advertising_removed(NULL, hdev, rem_inst);
+                               mgmt_advertising_removed(sk, hdev, rem_inst);
                }
        } else {
                adv_instance = hci_find_adv_instance(hdev, instance);
@@ -1325,7 +1346,7 @@ void hci_req_clear_adv_instance(struct hci_dev *hdev, struct hci_request *req,
 
                        err = hci_remove_adv_instance(hdev, instance);
                        if (!err)
-                               mgmt_advertising_removed(NULL, hdev, instance);
+                               mgmt_advertising_removed(sk, hdev, instance);
                }
        }
 
@@ -1716,7 +1737,7 @@ void __hci_abort_conn(struct hci_request *req, struct hci_conn *conn,
                         * function. To be safe hard-code one of the
                         * values that's suitable for SCO.
                         */
-                       rej.reason = HCI_ERROR_REMOTE_LOW_RESOURCES;
+                       rej.reason = HCI_ERROR_REJ_LIMITED_RESOURCES;
 
                        hci_req_add(req, HCI_OP_REJECT_SYNC_CONN_REQ,
                                    sizeof(rej), &rej);