Bluetooth: controller: Fix Re-encryption procedure

Fix MIC failure on re-encryption procedure when responding
at the same time to peer initiated feature request.

Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>

Author: cvinayak

subsys/bluetooth/controller/ll_sw/ctrl.c

@@ -1911,6 +1911,9 @@ static inline u32_t isr_rx_conn_pkt_ack(struct pdu_data *pdu_data_tx,
 		 */
 		_radio.conn_curr->procedure_expire =
 			_radio.conn_curr->procedure_reload;
+
+		/* Reset enc req queued state */
+		_radio.conn_curr->llcp_enc.ack = _radio.conn_curr->llcp_enc.req;
 		break;
 
 	case PDU_DATA_LLCTRL_TYPE_PAUSE_ENC_RSP:
@@ -9782,7 +9785,10 @@ static bool is_enc_req_pause_tx(struct connection *conn)
 
 	pdu_data_tx = (void *)conn->pkt_tx_head->pdu_data;
 	if ((pdu_data_tx->ll_id == PDU_DATA_LLID_CTRL) &&
-	    (pdu_data_tx->llctrl.opcode == PDU_DATA_LLCTRL_TYPE_ENC_REQ)) {
+	    ((pdu_data_tx->llctrl.opcode ==
+	      PDU_DATA_LLCTRL_TYPE_ENC_REQ) ||
+	     (pdu_data_tx->llctrl.opcode ==
+	      PDU_DATA_LLCTRL_TYPE_PAUSE_ENC_REQ))) {
 		if (((conn->llcp_req != conn->llcp_ack) &&
 		     (conn->llcp_type != LLCP_ENCRYPTION)) ||
 		    ((conn->llcp_req == conn->llcp_ack) &&
@@ -9959,8 +9965,10 @@ static void prepare_pdu_data_tx(struct connection *conn,
 
 			pdu_data_tx = (void *)conn->pkt_tx_head->pdu_data;
 			if ((pdu_data_tx->ll_id != PDU_DATA_LLID_CTRL) ||
-			    (pdu_data_tx->llctrl.opcode !=
-			     PDU_DATA_LLCTRL_TYPE_ENC_REQ)) {
+			    ((pdu_data_tx->llctrl.opcode !=
+			      PDU_DATA_LLCTRL_TYPE_ENC_REQ) &&
+			     (pdu_data_tx->llctrl.opcode !=
+			      PDU_DATA_LLCTRL_TYPE_PAUSE_ENC_REQ))) {
 				conn->pkt_tx_ctrl = conn->pkt_tx_ctrl_last =
 					conn->pkt_tx_head;
 			}