diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c index 72346d8db76..903a4b2e549 100644 --- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c +++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c @@ -727,7 +727,7 @@ void lll_conn_pdu_tx_prep(struct lll_conn *lll, struct pdu_data **pdu_data_tx) if (lll->packet_tx_head_offset) { p->ll_id = PDU_DATA_LLID_DATA_CONTINUE; -#if defined(CONFIG_BT_CTLR_DF_CONN_CTE_TX) +#if defined(CONFIG_BT_CTLR_DF_CONN_CTE_TX) || defined(CONFIG_BT_CTLR_DF_CONN_CTE_RX) /* BT 5.3 Core Spec does not define handling of CP bit * for PDUs fragmented by Controller, hence the CP bit * is set to zero. The CTE should not be transmitted @@ -735,7 +735,7 @@ void lll_conn_pdu_tx_prep(struct lll_conn *lll, struct pdu_data **pdu_data_tx) */ p->cp = 0U; p->resv = 0U; -#endif /* CONFIG_BT_CTLR_DF_CONN_CTE_TX */ +#endif /* CONFIG_BT_CTLR_DF_CONN_CTE_TX || CONFIG_BT_CTLR_DF_CONN_CTE_RX */ } p->len = lll->packet_tx_head_len - lll->packet_tx_head_offset; @@ -755,9 +755,9 @@ void lll_conn_pdu_tx_prep(struct lll_conn *lll, struct pdu_data **pdu_data_tx) p->rfu = 0U; #if !defined(CONFIG_BT_CTLR_DATA_LENGTH_CLEAR) -#if !defined(CONFIG_BT_CTLR_DF_CONN_CTE_TX) +#if !defined(CONFIG_BT_CTLR_DF_CONN_CTE_TX) && !defined(CONFIG_BT_CTLR_DF_CONN_CTE_RX) p->resv = 0U; -#endif /* !CONFIG_BT_CTLR_DF_CONN_CTE_TX */ +#endif /* !CONFIG_BT_CTLR_DF_CONN_CTE_TX && !CONFIG_BT_CTLR_DF_CONN_CTE_RX */ #endif /* CONFIG_BT_CTLR_DATA_LENGTH_CLEAR */ } diff --git a/subsys/bluetooth/controller/ll_sw/ull_conn.c b/subsys/bluetooth/controller/ll_sw/ull_conn.c index b459c544c74..4aa8ca0d891 100644 --- a/subsys/bluetooth/controller/ll_sw/ull_conn.c +++ b/subsys/bluetooth/controller/ll_sw/ull_conn.c @@ -2080,14 +2080,14 @@ uint16_t ull_conn_lll_max_tx_octets_get(struct lll_conn *lll) /** * @brief Initialize pdu_data members that are read only in lower link layer. * - * @param pdu_tx Pointer to pdu_data object to be initialized + * @param pdu Pointer to pdu_data object to be initialized */ -void ull_pdu_data_init(struct pdu_data *pdu_tx) +void ull_pdu_data_init(struct pdu_data *pdu) { -#if defined(CONFIG_BT_CTLR_DF_CONN_CTE_TX) - pdu_tx->cp = 0U; - pdu_tx->resv = 0U; -#endif /* CONFIG_BT_CTLR_DF_CONN_CTE_TX */ +#if defined(CONFIG_BT_CTLR_DF_CONN_CTE_TX) || defined(CONFIG_BT_CTLR_DF_CONN_CTE_RX) + pdu->cp = 0U; + pdu->resv = 0U; +#endif /* CONFIG_BT_CTLR_DF_CONN_CTE_TX || CONFIG_BT_CTLR_DF_CONN_CTE_RX */ } static int init_reset(void) diff --git a/subsys/bluetooth/controller/ll_sw/ull_conn_internal.h b/subsys/bluetooth/controller/ll_sw/ull_conn_internal.h index 381a8e36768..a2def1b4246 100644 --- a/subsys/bluetooth/controller/ll_sw/ull_conn_internal.h +++ b/subsys/bluetooth/controller/ll_sw/ull_conn_internal.h @@ -37,7 +37,7 @@ void *ull_conn_ack_dequeue(void); void ull_conn_tx_ack(uint16_t handle, memq_link_t *link, struct node_tx *tx); uint8_t ull_conn_llcp_req(void *conn); -void ull_pdu_data_init(struct pdu_data *pdu_tx); +void ull_pdu_data_init(struct pdu_data *pdu); #if !defined(CONFIG_BT_LL_SW_LLCP_LEGACY)