Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f51d5b24 authored by Johan Hedberg's avatar Johan Hedberg
Browse files

Bluetooth: mgmt: Fix updating EIR when updating the name 



Whenever we update the local device name the EIR data also needs to be
updated to reflect this. The update_eir() function in mgmt.c depends on
hdev->dev_name to be up to date so the patch also makes sure that the
mgmt function is called from hci_event.c after the update has happened.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent e59fda8d

net/bluetooth/hci_event.c

+3 −3
Original line number Diff line number Diff line
@@ -209,12 +209,12 @@ static void hci_cc_write_local_name(struct hci_dev *hdev, struct sk_buff *skb) 


	hci_dev_lock(hdev);



	if (test_bit(HCI_MGMT, &hdev->dev_flags))

		mgmt_set_local_name_complete(hdev, sent, status);



	if (status == 0)

		memcpy(hdev->dev_name, sent, HCI_MAX_NAME_LENGTH);



	if (test_bit(HCI_MGMT, &hdev->dev_flags))

		mgmt_set_local_name_complete(hdev, sent, status);



	hci_dev_unlock(hdev);

}

net/bluetooth/mgmt.c

+1 −0
Original line number Diff line number Diff line
@@ -3561,6 +3561,7 @@ int mgmt_set_local_name_complete(struct hci_dev *hdev, u8 *name, u8 status) 
send_event:

	err = mgmt_event(MGMT_EV_LOCAL_NAME_CHANGED, hdev, &ev, sizeof(ev),

							cmd ? cmd->sk : NULL);

	update_eir(hdev);



failed:

	if (cmd)