Commit 26e335cc authored by Vinayak Kariappa Chettimada's avatar Vinayak Kariappa Chettimada Committed by Anas Nashif
Browse files

Bluetooth: controller: Fix data length update procedure checks 



Fix data legnth update procedure to check transaction
violations.

Signed-off-by: default avatarVinayak Kariappa Chettimada <vich@nordicsemi.no>
parent 871ab25c

subsys/bluetooth/controller/ll_sw/ull_conn.c

+13 −2
Original line number Diff line number Diff line
@@ -4885,9 +4885,12 @@ static inline int length_req_rsp_recv(struct ll_conn *conn, memq_link_t *link, 


	/* Check for free ctrl tx PDU */

	if (pdu_rx->llctrl.opcode == PDU_DATA_LLCTRL_TYPE_LENGTH_REQ) {

		tx = mem_acquire(&mem_conn_tx_ctrl.free);

		int err;



		/* Check transaction violation and get free ctrl tx PDU */

		tx = ctrl_tx_rsp_mem_acquire(conn, *rx, &err);

		if (!tx) {

			return -ENOBUFS;

			return err;

		}

	}
@@ -5085,6 +5088,11 @@ static inline int length_req_rsp_recv(struct ll_conn *conn, memq_link_t *link, 
		if (pdu_rx->llctrl.opcode != PDU_DATA_LLCTRL_TYPE_LENGTH_RSP) {

			mem_release(tx, &mem_conn_tx_ctrl.free);



			/* Release the transacation lock, as ctrl tx PDU is not

			 * being enqueued.

			 */

			conn->common.txn_lock = 0U;



			/* Defer new request if previous in resize state */

			if (conn->llcp_length.state ==

			    LLCP_LENGTH_STATE_RESIZE) {
@@ -5458,6 +5466,9 @@ static inline void ctrl_tx_ack(struct ll_conn *conn, struct node_tx **tx, 
		break;



	case PDU_DATA_LLCTRL_TYPE_LENGTH_RSP:

		/* Reset the transaction lock */

		conn->common.txn_lock = 0U;



		if (conn->llcp_length.req != conn->llcp_length.ack) {

			switch (conn->llcp_length.state) {

			case LLCP_LENGTH_STATE_RSP_ACK_WAIT:

CRA Git | Maintained and supported by SUSTech CRA and CCSE