From 1751648db02258d6c56c4ca1e6fea591bf5bc806 Mon Sep 17 00:00:00 2001 From: Vinayak Kariappa Chettimada Date: Thu, 22 Aug 2019 17:39:46 +0530 Subject: [PATCH] Bluetooth: controller: split: 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") Signed-off-by: Vinayak Kariappa Chettimada --- subsys/bluetooth/controller/ll_sw/ull_conn.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/subsys/bluetooth/controller/ll_sw/ull_conn.c b/subsys/bluetooth/controller/ll_sw/ull_conn.c index 9c7b62ea1ef..43c289656e0 100644 --- a/subsys/bluetooth/controller/ll_sw/ull_conn.c +++ b/subsys/bluetooth/controller/ll_sw/ull_conn.c @@ -3804,6 +3804,7 @@ static void reject_ext_ind_recv(struct ll_conn *conn, struct node_rx_pdu *rx, conn->llcp_enc.pause_tx = 0U; /* Procedure complete */ + conn->llcp_ack = conn->llcp_req; conn->procedure_expire = 0U; /* enqueue as if it were a reject ind */ @@ -4705,8 +4706,8 @@ static inline int ctrl_rx(memq_link_t *link, struct node_rx_pdu **rx, conn->llcp_enc.pause_tx = 0U; /* Procedure complete */ + conn->llcp_ack = conn->llcp_req; conn->procedure_expire = 0U; - break; #endif /* CONFIG_BT_CTLR_LE_ENC */