Bluetooth: Fix powering on with privacy and advertising

In order to enable advertising with privacy enabled, SMP has to be
registered in order to generate new RPA. During power on, it will be
registered at the very end which is the reason why advertising is not
enabled and it's not possible to enable it anymore due to mismatch
between hci_dev settings and actual controller state.

This fixes this problem by moving SMP registration earlier, just after
controller is powered (which is ok, because LE SMP will be already able
to decide on identity address to be used), but before advertising is
enabled.

Signed-off-by: Andrzej Kaczmarek <andrzej.kaczmarek@codecoup.pl>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index dc8e428050d93e353ddcfbf5e8e0cd92669537f7..e8a2f8baf958c8a0e6e1e7f36a5254973a379f63 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -7305,13 +7305,6 @@ static void powered_complete(struct hci_dev *hdev, u8 status, u16 opcode)
        BT_DBG("status 0x%02x", status);
 
        if (!status) {
-               /* Register the available SMP channels (BR/EDR and LE) only
-                * when successfully powering on the controller. This late
-                * registration is required so that LE SMP can clearly
-                * decide if the public address or static address is used.
-                */
-               smp_register(hdev);
-
                restart_le_actions(hdev);
                hci_update_background_scan(hdev);
        }
@@ -7423,6 +7416,13 @@ int mgmt_powered(struct hci_dev *hdev, u8 powered)
                return 0;
 
        if (powered) {
+               /* Register the available SMP channels (BR/EDR and LE) only
+                * when successfully powering on the controller. This late
+                * registration is required so that LE SMP can clearly
+                * decide if the public address or static address is used.
+                */
+               smp_register(hdev);
+
                if (powered_update_hci(hdev) == 0)
                        return 0;