Skip to content

Commit 472169b

Browse files
cvinayakcarlescufi
authored andcommitted
Bluetooth: controller: Ensure both 1M and Coded PHY can initiate
Ensure that the advertiser address type and address is setup in both 1M and Coded PHY scanning instance when extended create connection is enabled on both the PHYs. Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
1 parent a6b8eba commit 472169b

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

subsys/bluetooth/controller/ll_sw/ull_master.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -152,12 +152,6 @@ uint8_t ll_create_connection(uint16_t scan_interval, uint16_t scan_window,
152152
return BT_HCI_ERR_MEM_CAPACITY_EXCEEDED;
153153
}
154154

155-
ull_scan_params_set(lll, 0, scan_interval, scan_window, filter_policy);
156-
157-
lll->adv_addr_type = peer_addr_type;
158-
memcpy(lll->adv_addr, peer_addr, BDADDR_SIZE);
159-
lll->conn_timeout = timeout;
160-
161155
conn_lll = &conn->lll;
162156

163157
err = util_aa_le32(conn_lll->access_addr);
@@ -354,6 +348,11 @@ uint8_t ll_create_connection(uint16_t scan_interval, uint16_t scan_window,
354348
#endif
355349

356350
scan->own_addr_type = own_addr_type;
351+
lll->adv_addr_type = peer_addr_type;
352+
memcpy(lll->adv_addr, peer_addr, BDADDR_SIZE);
353+
lll->conn_timeout = timeout;
354+
355+
ull_scan_params_set(lll, 0, scan_interval, scan_window, filter_policy);
357356

358357
#if defined(CONFIG_BT_CTLR_ADV_EXT)
359358
return 0;

0 commit comments

Comments
 (0)