michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Fix a bug in ctrl and data management

Browse source 
Fix the control and data packet management implementation
discovered during conformance testing.

This fixes:
TP/SEC/MAS/BV-12 [Master Start Encryption: Overlapping
Procedure]
TP/SEC/MAS/BV-13 [Master Start Encryption: Overlapping
Procedure with LL_SLAVE_FEATURES_REQ]
conformance tests in LL.TS.5.0.0.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2017-09-05 11:43:45 +02:00 • committed by Anas Nashif
commit 4f87ad2ec1
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
subsys/bluetooth/controller/ll_sw/ctrl.c
View file

@ -1802,15 +1802,12 @@ isr_rx_conn_pkt_release(struct radio_pdu_node_tx *node_tx)
/* release */
if (conn->pkt_tx_head == conn->pkt_tx_ctrl) {
if (node_tx) {
conn->pkt_tx_head = conn->pkt_tx_head->next;
if (conn->pkt_tx_ctrl == conn->pkt_tx_ctrl_last) {
conn->pkt_tx_ctrl_last =
conn->pkt_tx_ctrl_last->next;
}
conn->pkt_tx_ctrl = conn->pkt_tx_ctrl->next;
conn->pkt_tx_head = conn->pkt_tx_ctrl;
if (conn->pkt_tx_ctrl == conn->pkt_tx_data) {
conn->pkt_tx_ctrl = NULL;
conn->pkt_tx_ctrl_last = NULL;
} else {
conn->pkt_tx_ctrl = conn->pkt_tx_head;
}
mem_release(node_tx, &_radio. pkt_tx_ctrl_free);