michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Check if enc procedure is in progress

Browse source 
Check if the encryption procedure is in progress when receiving
rejection for the procedure.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2019-10-03 08:46:49 +02:00 • committed by Carles Cufí
commit 4d59ef306b
1 changed files with 26 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2274,6 +2274,23 @@ isr_rx_conn_pkt_ctrl_rej_phy_upd(struct radio_pdu_node_rx *node_rx,
} }
#endif /* CONFIG_BT_CTLR_PHY */ #endif /* CONFIG_BT_CTLR_PHY */
#if defined(CONFIG_BT_CTLR_LE_ENC)
static inline void
isr_rx_conn_pkt_ctrl_rej_enc(struct radio_pdu_node_rx *node_rx,
u8_t *rx_enqueue)
{
/* resume data packet rx and tx */
_radio.conn_curr->pause_rx = 0U;
_radio.conn_curr->pause_tx = 0U;
/* Procedure complete */
_radio.conn_curr->llcp_ack = _radio.conn_curr->llcp_req;
_radio.conn_curr->procedure_expire = 0U;
*rx_enqueue = 1U;
}
#endif /* CONFIG_BT_CTLR_LE_ENC */
static inline void static inline void
isr_rx_conn_pkt_ctrl_rej(struct radio_pdu_node_rx *node_rx, u8_t *rx_enqueue) isr_rx_conn_pkt_ctrl_rej(struct radio_pdu_node_rx *node_rx, u8_t *rx_enqueue)
{ {
@ -2286,19 +2303,15 @@ isr_rx_conn_pkt_ctrl_rej(struct radio_pdu_node_rx *node_rx, u8_t *rx_enqueue)
switch (rej_ext_ind->reject_opcode) { switch (rej_ext_ind->reject_opcode) {
#if defined(CONFIG_BT_CTLR_LE_ENC) #if defined(CONFIG_BT_CTLR_LE_ENC)
case PDU_DATA_LLCTRL_TYPE_ENC_REQ: case PDU_DATA_LLCTRL_TYPE_ENC_REQ:
/* resume data packet rx and tx */ if (_radio.conn_curr->llcp_ack != _radio.conn_curr->llcp_req &&
_radio.conn_curr->pause_rx = 0U; _radio.conn_curr->llcp_type == LLCP_ENCRYPTION) {
_radio.conn_curr->pause_tx = 0U; /* enqueue as if it were a reject ind */
pdu_rx->llctrl.opcode = PDU_DATA_LLCTRL_TYPE_REJECT_IND;
pdu_rx->llctrl.reject_ind.error_code =
rej_ext_ind->error_code;
/* Procedure complete */ isr_rx_conn_pkt_ctrl_rej_enc(node_rx, rx_enqueue);
_radio.conn_curr->llcp_ack = _radio.conn_curr->llcp_req; }
_radio.conn_curr->procedure_expire = 0U;
/* enqueue as if it were a reject ind */
pdu_rx->llctrl.opcode = PDU_DATA_LLCTRL_TYPE_REJECT_IND;
pdu_rx->llctrl.reject_ind.error_code =
rej_ext_ind->error_code;
*rx_enqueue = 1U;
break; break;
#endif /* CONFIG_BT_CTLR_LE_ENC */ #endif /* CONFIG_BT_CTLR_LE_ENC */
@ -2935,16 +2948,7 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *node_rx,
goto isr_rx_conn_unknown_rsp_send; goto isr_rx_conn_unknown_rsp_send;
} }
/* resume data packet rx and tx */ isr_rx_conn_pkt_ctrl_rej_enc(node_rx, rx_enqueue);
_radio.conn_curr->pause_rx = 0U;
_radio.conn_curr->pause_tx = 0U;
/* Procedure complete */
_radio.conn_curr->llcp_ack = _radio.conn_curr->llcp_req;
_radio.conn_curr->procedure_expire = 0U;
/* enqueue the reject ind */
*rx_enqueue = 1U;
break; break;
#endif /* CONFIG_BT_CTLR_LE_ENC */ #endif /* CONFIG_BT_CTLR_LE_ENC */