Skip to content

Commit 3f89425

Browse files
cvinayakcarlescufi
authored andcommitted
Bluetooth: controller: Fix Enc setup reset on rejection
Fix reset of Encryption Procedure state on reception of REJECT_IND and REJECT_EXT_IND. This is a regression in commit 79cb615 ("Bluetooth: controller: split: Port Enc setup to be queueable") Relates to #18578. Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
1 parent d52b8df commit 3f89425

File tree

1 file changed

+2
-0
lines changed
  • subsys/bluetooth/controller/ll_sw

1 file changed

+2
-0
lines changed

subsys/bluetooth/controller/ll_sw/ctrl.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2254,6 +2254,7 @@ isr_rx_conn_pkt_ctrl_rej(struct radio_pdu_node_rx *node_rx, u8_t *rx_enqueue)
22542254
_radio.conn_curr->pause_tx = 0U;
22552255

22562256
/* Procedure complete */
2257+
_radio.conn_curr->llcp_ack = _radio.conn_curr->llcp_req;
22572258
_radio.conn_curr->procedure_expire = 0U;
22582259

22592260
/* enqueue as if it were a reject ind */
@@ -2863,6 +2864,7 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *node_rx,
28632864
_radio.conn_curr->pause_tx = 0U;
28642865

28652866
/* Procedure complete */
2867+
_radio.conn_curr->llcp_ack = _radio.conn_curr->llcp_req;
28662868
_radio.conn_curr->procedure_expire = 0U;
28672869

28682870
/* enqueue the reject ind */

0 commit comments

Comments
 (0)