extmod/btstack: Fix marking of static addresses in set_random_address.

peterharperuk · dpgeorge · commit ba83f6d50c0d · 2023-06-14T22:20:20.000+10:00
Marking address as static was not applied to all code paths.

Signed-off-by: Damien George &lt;damien@micropython.org&gt;
diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
@@ -544,8 +544,6 @@ STATIC void set_random_address(void) {
 
         DEBUG_printf("set_random_address: Generating static address using mp_hal_get_mac\n");
         mp_hal_get_mac(MP_HAL_MAC_BDADDR, static_addr);
-        // Mark it as STATIC (not RPA or NRPA).
-        static_addr[0] |= 0xc0;
 
         #else
 
@@ -558,6 +556,8 @@ STATIC void set_random_address(void) {
         }
 
         #endif // MICROPY_BLUETOOTH_USE_MP_HAL_GET_MAC_STATIC_ADDRESS
+        // Mark it as STATIC (not RPA or NRPA).
+        static_addr[0] |= 0xc0;
 
         DEBUG_printf("set_random_address: Address generated.\n");
         gap_random_address_set(static_addr);
