Bluetooth: Fix unnecessary EIR update during powering on

When powered on the EIR data gets updated as the last step by mgmt.
Therefore avoid an update when getting a local name update as that's
part of the normal HCI init sequence.

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 9017287224d36a32bd68572844e161ca5d0540f6..bcf7690a23cb57256decaead43f600f89ac46676 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -3516,7 +3516,12 @@ send_event:
                err = mgmt_event(MGMT_EV_LOCAL_NAME_CHANGED, hdev, &ev,
                                 sizeof(ev), cmd ? cmd->sk : NULL);
 
-       update_eir(hdev);
+       /* EIR is taken care of separately when powering on the
+        * adapter so only update them here if this is a name change
+        * unrelated to power on.
+        */
+       if (!test_bit(HCI_INIT, &hdev->flags))
+               update_eir(hdev);
 
 failed:
        if (cmd)