michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Fix compile error when LE_ENC is disabled

Browse source 
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: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2017-11-21 10:08:30 +01:00 • committed by Anas Nashif
commit f9cd9d4a7b
1 changed files with 21 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2608,12 +2608,21 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx,
PDU_DATA_LLCTRL_TYPE_CONN_PARAM_REQ, PDU_DATA_LLCTRL_TYPE_CONN_PARAM_REQ,
0x23); 0x23);
#if defined(CONFIG_BT_CTLR_PHY) #if defined(CONFIG_BT_CTLR_PHY)
#if defined(CONFIG_BT_CTLR_LE_ENC)
} else if (((conn->llcp_req != conn->llcp_ack) && } else if (((conn->llcp_req != conn->llcp_ack) &&
(conn->llcp_type != LLCP_ENCRYPTION)) || (conn->llcp_type != LLCP_ENCRYPTION)) ||
(conn->llcp_phy.req != conn->llcp_phy.ack)) { (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 */ #else /* !CONFIG_BT_CTLR_PHY */
#if defined(CONFIG_BT_CTLR_LE_ENC)
} else if ((conn->llcp_req != conn->llcp_ack) && } else if ((conn->llcp_req != conn->llcp_ack) &&
(conn->llcp_type != LLCP_ENCRYPTION)) { (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 */ #endif /* !CONFIG_BT_CTLR_PHY */
/* Different procedure collision */ /* Different procedure collision */
nack = reject_ext_ind_send(_radio.conn_curr, nack = reject_ext_ind_send(_radio.conn_curr,
@ -2932,17 +2941,29 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx,
PDU_DATA_LLCTRL_TYPE_PHY_REQ, PDU_DATA_LLCTRL_TYPE_PHY_REQ,
0x23); 0x23);
#if defined(CONFIG_BT_CTLR_CONN_PARAM_REQ) #if defined(CONFIG_BT_CTLR_CONN_PARAM_REQ)
#if defined(CONFIG_BT_CTLR_LE_ENC)
} else if (((_radio.conn_curr->llcp_req != } else if (((_radio.conn_curr->llcp_req !=
_radio.conn_curr->llcp_ack) && _radio.conn_curr->llcp_ack) &&
(_radio.conn_curr->llcp_type != (_radio.conn_curr->llcp_type !=
LLCP_ENCRYPTION)) || LLCP_ENCRYPTION)) ||
(_radio.conn_curr->llcp_conn_param.req != (_radio.conn_curr->llcp_conn_param.req !=
_radio.conn_curr->llcp_conn_param.ack)) { _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 */ #else /* !CONFIG_BT_CTLR_CONN_PARAM_REQ */
#if defined(CONFIG_BT_CTLR_LE_ENC)
} else if ((_radio.conn_curr->llcp_req != } else if ((_radio.conn_curr->llcp_req !=
_radio.conn_curr->llcp_ack) && _radio.conn_curr->llcp_ack) &&
(_radio.conn_curr->llcp_type != (_radio.conn_curr->llcp_type !=
LLCP_ENCRYPTION)) { 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 */ #endif /* !CONFIG_BT_CTLR_CONN_PARAM_REQ */
/* Different procedure collision */ /* Different procedure collision */
nack = reject_ext_ind_send(_radio.conn_curr, nack = reject_ext_ind_send(_radio.conn_curr,