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

Bluetooth: controller: Fix compile error when LE_ENC is disabled 



Fixes the following compile error when CONFIG_BT_CTLR_LE_ENC
is disabled:
subsys/bluetooth/controller/ll_sw/ctrl.c: In function
'isr_rx_conn_pkt_ctrl':
subsys/bluetooth/controller/ll_sw/ctrl.c:2613:29: error:
'LLCP_ENCRYPTION' undeclared (first use in this function)
         (conn->llcp_type != LLCP_ENCRYPTION)) ||
                             ^~~~~~~~~~~~~~~
Signed-off-by: default avatarVinayak Kariappa Chettimada <vich@nordicsemi.no>
parent 4c52b42b

subsys/bluetooth/controller/ll_sw/ctrl.c

+21 −0
Original line number Diff line number Diff line
@@ -2609,12 +2609,21 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, 
					PDU_DATA_LLCTRL_TYPE_CONN_PARAM_REQ,

					0x23);

#if defined(CONFIG_BT_CTLR_PHY)

#if defined(CONFIG_BT_CTLR_LE_ENC)

			} else if (((conn->llcp_req != conn->llcp_ack) &&

				    (conn->llcp_type != LLCP_ENCRYPTION)) ||

				   (conn->llcp_phy.req != conn->llcp_phy.ack)) {

#else /* !CONFIG_BT_CTLR_LE_ENC */

			} else if ((conn->llcp_req != conn->llcp_ack) ||

				   (conn->llcp_phy.req != conn->llcp_phy.ack)) {

#endif /* !CONFIG_BT_CTLR_LE_ENC */

#else /* !CONFIG_BT_CTLR_PHY */

#if defined(CONFIG_BT_CTLR_LE_ENC)

			} else if ((conn->llcp_req != conn->llcp_ack) &&

				   (conn->llcp_type != LLCP_ENCRYPTION)) {

#else /* !CONFIG_BT_CTLR_LE_ENC */

			} else if (conn->llcp_req != conn->llcp_ack) {

#endif /* !CONFIG_BT_CTLR_LE_ENC */

#endif /* !CONFIG_BT_CTLR_PHY */

				/* Different procedure collision */

				nack = reject_ext_ind_send(_radio.conn_curr,
@@ -2933,17 +2942,29 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx, 
					PDU_DATA_LLCTRL_TYPE_PHY_REQ,

					0x23);

#if defined(CONFIG_BT_CTLR_CONN_PARAM_REQ)

#if defined(CONFIG_BT_CTLR_LE_ENC)

			} else if (((_radio.conn_curr->llcp_req !=

				     _radio.conn_curr->llcp_ack) &&

				    (_radio.conn_curr->llcp_type !=

				     LLCP_ENCRYPTION)) ||

				   (_radio.conn_curr->llcp_conn_param.req !=

				    _radio.conn_curr->llcp_conn_param.ack)) {

#else /* !CONFIG_BT_CTLR_LE_ENC */

			} else if ((_radio.conn_curr->llcp_req !=

				     _radio.conn_curr->llcp_ack) ||

				   (_radio.conn_curr->llcp_conn_param.req !=

				    _radio.conn_curr->llcp_conn_param.ack)) {

#endif /* !CONFIG_BT_CTLR_LE_ENC */

#else /* !CONFIG_BT_CTLR_CONN_PARAM_REQ */

#if defined(CONFIG_BT_CTLR_LE_ENC)

			} else if ((_radio.conn_curr->llcp_req !=

				    _radio.conn_curr->llcp_ack) &&

				   (_radio.conn_curr->llcp_type !=

				    LLCP_ENCRYPTION)) {

#else /* !CONFIG_BT_CTLR_LE_ENC */

			} else if (_radio.conn_curr->llcp_req !=

				    _radio.conn_curr->llcp_ack) {

#endif /* !CONFIG_BT_CTLR_LE_ENC */

#endif /* !CONFIG_BT_CTLR_CONN_PARAM_REQ */

				/* Different procedure collision */

				nack = reject_ext_ind_send(_radio.conn_curr,

CRA Git | Maintained and supported by SUSTech CRA and CCSE