Skip to content

Commit 038c89b

Browse files
cvinayakaescolar
authored andcommitted
Bluetooth: Controller: Remove redundant CIS encryption code
Remove redundant unused CIS encryption related code. Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
1 parent 0777583 commit 038c89b

File tree

2 files changed

+0
-56
lines changed

2 files changed

+0
-56
lines changed

subsys/bluetooth/controller/ll_sw/nordic/lll/lll_central_iso.c

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -715,33 +715,6 @@ static void isr_rx(void *param)
715715
/* Increment sequence number */
716716
cis_lll->sn++;
717717

718-
#if defined(CONFIG_BT_CTLR_LE_ENC)
719-
if (!cis_lll->npi) {
720-
/* Get reference to PDU Tx */
721-
struct node_tx_iso *node_tx;
722-
struct pdu_cis *pdu_tx;
723-
uint8_t payload_index;
724-
memq_link_t *link;
725-
726-
payload_index = bn_tx - 1U;
727-
link = memq_peek_n(cis_lll->memq_tx.head,
728-
cis_lll->memq_tx.tail,
729-
payload_index,
730-
(void **)&node_tx);
731-
pdu_tx = (void *)node_tx->pdu;
732-
if (pdu_tx->len) {
733-
/* Get reference to ACL context */
734-
const struct lll_conn *conn_lll =
735-
ull_conn_lll_get(cis_lll->acl_handle);
736-
737-
/* if encrypted increment tx counter */
738-
if (conn_lll->enc_tx) {
739-
cis_lll->tx.ccm.counter++;
740-
}
741-
}
742-
}
743-
#endif /* CONFIG_BT_CTLR_LE_ENC */
744-
745718
/* Increment burst number */
746719
if (bn_tx <= cis_lll->tx.bn) {
747720
bn_tx++;
@@ -782,9 +755,6 @@ static void isr_rx(void *param)
782755
goto isr_rx_done;
783756
}
784757

785-
/* Increment counter */
786-
cis_lll->rx.ccm.counter++;
787-
788758
/* Record MIC valid */
789759
mic_state = LLL_CONN_MIC_PASS;
790760
}

subsys/bluetooth/controller/ll_sw/nordic/lll/lll_peripheral_iso.c

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -510,29 +510,6 @@ static void isr_rx(void *param)
510510
/* Increment sequence number */
511511
cis_lll->sn++;
512512

513-
#if defined(CONFIG_BT_CTLR_LE_ENC)
514-
if (!cis_lll->npi) {
515-
/* Get reference to PDU Tx */
516-
struct node_tx_iso *node_tx;
517-
struct pdu_cis *pdu_tx;
518-
uint8_t payload_index;
519-
memq_link_t *link;
520-
521-
payload_index = bn_tx - 1U;
522-
link = memq_peek_n(cis_lll->memq_tx.head,
523-
cis_lll->memq_tx.tail,
524-
payload_index,
525-
(void **)&node_tx);
526-
pdu_tx = (void *)node_tx->pdu;
527-
if (pdu_tx->len) {
528-
/* if encrypted increment tx counter */
529-
if (conn_lll->enc_tx) {
530-
cis_lll->tx.ccm.counter++;
531-
}
532-
}
533-
}
534-
#endif /* CONFIG_BT_CTLR_LE_ENC */
535-
536513
/* Increment burst number */
537514
if (bn_tx <= cis_lll->tx.bn) {
538515
bn_tx++;
@@ -572,9 +549,6 @@ static void isr_rx(void *param)
572549
return;
573550
}
574551

575-
/* Increment counter */
576-
cis_lll->rx.ccm.counter++;
577-
578552
/* Record MIC valid */
579553
mic_state = LLL_CONN_MIC_PASS;
580554
}

0 commit comments

Comments
 (0)