Commit 3f985050 authored Mar 15, 2013 by Johan Hedberg Committed by Gustavo Padovan Mar 18, 2013

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>

parent 04b4edcb

net/bluetooth/mgmt.c

+9 −2

Original line number	Diff line number	Diff line
		@@ -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);

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