michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Fix Enc setup reset on rejection

Browse source 
Fix reset of Encryption Procedure state on reception of
REJECT_IND and REJECT_EXT_IND.

This is a regression in commit 79cb615770 ("Bluetooth:
controller: split: Port Enc setup to be queueable")

Relates to #18578.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2019-08-22 17:39:46 +05:30 • committed by Carles Cufí
commit 3f894250ef
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
subsys/bluetooth/controller/ll_sw/ctrl.c
View file

@ -2254,6 +2254,7 @@ isr_rx_conn_pkt_ctrl_rej(struct radio_pdu_node_rx *node_rx, u8_t *rx_enqueue)
_radio.conn_curr->pause_tx = 0U;
/* Procedure complete */
_radio.conn_curr->llcp_ack = _radio.conn_curr->llcp_req;
_radio.conn_curr->procedure_expire = 0U;
/* enqueue as if it were a reject ind */
@ -2863,6 +2864,7 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *node_rx,
_radio.conn_curr->pause_tx = 0U;
/* Procedure complete */
_radio.conn_curr->llcp_ack = _radio.conn_curr->llcp_req;
_radio.conn_curr->procedure_expire = 0U;
/* enqueue the reject ind */