Skip to content

Commit 796be5a

Browse files
cvinayakrlubos
authored andcommitted
[nrf fromtree] Bluetooth: Controller: Fix assertion due to late PER CIS active set
Fix assertion due to late Peripheral CIS active flag being initialized. CIS active flag shall be initialized when it is acquired. Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no> (cherry picked from commit cb28104) Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
1 parent 834626a commit 796be5a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

subsys/bluetooth/controller/ll_sw/ull_peripheral_iso.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,8 @@ uint8_t ull_peripheral_iso_acquire(struct ll_conn *acl,
250250
cis->p_max_sdu = (uint16_t)(req->p_max_sdu[1] & 0x0F) << 8 |
251251
req->p_max_sdu[0];
252252

253-
cis->lll.handle = 0xFFFF;
253+
cis->lll.active = 0U;
254+
cis->lll.handle = LLL_HANDLE_INVALID;
254255
cis->lll.acl_handle = acl->lll.handle;
255256
cis->lll.sub_interval = sys_get_le24(req->sub_interval);
256257
cis->lll.nse = req->nse;
@@ -325,7 +326,6 @@ uint8_t ull_peripheral_iso_setup(struct pdu_data_llctrl_cis_ind *ind,
325326
cis->lll.cie = 0U;
326327
cis->lll.npi = 0U;
327328
cis->lll.flush = LLL_CIS_FLUSH_NONE;
328-
cis->lll.active = 0U;
329329
cis->lll.datapath_ready_rx = 0U;
330330
cis->lll.tx.payload_count = 0U;
331331
cis->lll.rx.payload_count = 0U;

0 commit comments

Comments
 (0)