Skip to content

Commit c1af0c2

Browse files
cvinayaknashif
authored andcommitted
Bluetooth: controller: legacy: Fix dev assert in CPR implementation
Replace a development assertion in the implementation of Connection Parameter Request Procedure with an internal comment and handle transaction violation be ignoring the PDU. Relates to commit dec6140 ("Bluetooth: controller: Fix dev assert in CPR implementation"). Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
1 parent a219598 commit c1af0c2

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

subsys/bluetooth/controller/ll_sw/ctrl.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3288,7 +3288,10 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *node_rx,
32883288
_radio.conn_upd = conn;
32893289
}
32903290
} else {
3291-
LL_ASSERT(0);
3291+
/* Ignore duplicate request as peripheral is busy
3292+
* processing the previously initiated connection
3293+
* update request procedure.
3294+
*/
32923295
}
32933296
break;
32943297

subsys/bluetooth/controller/ll_sw/ull_conn.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4437,7 +4437,12 @@ static inline int ctrl_rx(memq_link_t *link, struct node_rx_pdu **rx,
44374437
conn_upd_curr = conn;
44384438
}
44394439
} else {
4440-
LL_ASSERT(0);
4440+
/* Ignore duplicate request as peripheral is busy
4441+
* processing the previously initiated connection
4442+
* update request procedure.
4443+
*/
4444+
/* Mark for buffer for release */
4445+
(*rx)->hdr.type = NODE_RX_TYPE_DC_PDU_RELEASE;
44414446
}
44424447
break;
44434448

0 commit comments

Comments
 (0)