Bluetooth: controller: Fix incorrect reset of CPR reject state

Fix regression in adding the state for Connection Parameter
Request being rejected where in Connection Parameter Request
Procedure state machine was prematurely reset before the
reject PDU was enqueued.

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

Author: cvinayak

subsys/bluetooth/controller/ll_sw/ull_conn.c

@@ -2320,16 +2320,23 @@ static inline int event_conn_upd_prep(struct ll_conn *conn, uint16_t lazy,
 			return -EINPROGRESS;
 
 		case LLCP_CUI_STATE_REJECT:
-			/* move to in progress */
-			conn->llcp_cu.state = LLCP_CUI_STATE_INPROG;
+			/* procedure request acked */
+			conn->llcp_ack = conn->llcp_req;
+			conn->llcp_cu.ack = conn->llcp_cu.req;
+			conn->llcp_conn_param.ack = conn->llcp_conn_param.req;
+
+			/* reset mutex */
+			ull_conn_upd_curr_reset();
+
 			/* enqueue control PDU */
 			pdu_ctrl_tx =
 				CONTAINER_OF(conn->llcp.conn_upd.pdu_win_offset,
 					     struct pdu_data,
 					     llctrl.conn_update_ind.win_offset);
 			tx = CONTAINER_OF(pdu_ctrl_tx, struct node_tx, pdu);
 			ctrl_tx_enqueue(conn, tx);
-			return -EINPROGRESS;
+			return -ECANCELED;
+
 		default:
 			LL_ASSERT(0);
 			break;

subsys/bluetooth/controller/ll_sw/ull_sched.c

@@ -277,15 +277,6 @@ void ull_sched_mfy_win_offset_select(void *param)
 	} else {
 		struct pdu_data *pdu_ctrl_tx;
 
-		/* procedure request acked */
-		conn->llcp_ack = conn->llcp_req;
-
-		/* CPR request acked */
-		conn->llcp_conn_param.ack = conn->llcp_conn_param.req;
-
-		/* reset mutex */
-		ull_conn_upd_curr_reset();
-
 		/* send reject_ind_ext */
 		pdu_ctrl_tx = CONTAINER_OF(conn->llcp.conn_upd.pdu_win_offset,
 					   struct pdu_data,