Bluetooth: Fix local name setting for LE-only controllers

This patch fixes the mgmt_set_local_name command to send the appropriate
HCI commands based on BR/EDR support and LE support. Local name and EIR
data should only be sent for BR/EDR capable controllers whereas an
update to the AD should only happen for LE capable controllers.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 1d50841fa7073b236419a00aea0b5d875c32abce..28e5975246c70010575d5a82f15211ebab54f174 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -2433,8 +2433,15 @@ static int set_local_name(struct sock *sk, struct hci_dev *hdev, void *data,
        memcpy(hdev->dev_name, cp->name, sizeof(hdev->dev_name));
 
        hci_req_init(&req, hdev);
-       update_name(&req);
-       update_eir(&req);
+
+       if (lmp_bredr_capable(hdev)) {
+               update_name(&req);
+               update_eir(&req);
+       }
+
+       if (lmp_le_capable(hdev))
+               hci_update_ad(&req);
+
        err = hci_req_run(&req, set_name_complete);
        if (err < 0)
                mgmt_pending_remove(cmd);