From 3f894250ef0cbb46c015b03fbb2ab09bce165cbc Mon Sep 17 00:00:00 2001 From: Vinayak Kariappa Chettimada Date: Thu, 22 Aug 2019 17:39:46 +0530 Subject: [PATCH] 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 79cb61577045 ("Bluetooth: controller: split: Port Enc setup to be queueable") Relates to #18578. Signed-off-by: Vinayak Kariappa Chettimada --- subsys/bluetooth/controller/ll_sw/ctrl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/subsys/bluetooth/controller/ll_sw/ctrl.c b/subsys/bluetooth/controller/ll_sw/ctrl.c index 76f43f41588..bf5c7ea9fd5 100644 --- a/subsys/bluetooth/controller/ll_sw/ctrl.c +++ b/subsys/bluetooth/controller/ll_sw/ctrl.c @@ -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 */