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: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 498b71a0579a..e44e3fd68628 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -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);
 }