michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Fix CPR conditional compilation

Browse source 
Move the newly added Connection Parameter Request reject
state implementation under conditional compilation.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2021-01-27 06:18:37 +05:30 • committed by Anas Nashif
commit 7295204af9
1 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

36
subsys/bluetooth/controller/ll_sw/ull_conn.c
View file

@ -2297,6 +2297,24 @@ static inline int event_conn_upd_prep(struct ll_conn *conn, uint16_t lazy,
case LLCP_CUI_STATE_SELECT: case LLCP_CUI_STATE_SELECT:
fp_mfy_select_or_use = ull_sched_mfy_win_offset_select; fp_mfy_select_or_use = ull_sched_mfy_win_offset_select;
break; break;
case LLCP_CUI_STATE_REJECT:
/* procedure request acked */
conn->llcp_ack = conn->llcp_req;
conn->llcp_cu.ack = conn->llcp_cu.req;
conn->llcp_conn_param.ack = conn->llcp_conn_param.req;
/* reset mutex */
ull_conn_upd_curr_reset();
/* enqueue control PDU */
pdu_ctrl_tx =
CONTAINER_OF(conn->llcp.conn_upd.pdu_win_offset,
struct pdu_data,
llctrl.conn_update_ind.win_offset);
tx = CONTAINER_OF(pdu_ctrl_tx, struct node_tx, pdu);
ctrl_tx_enqueue(conn, tx);
return -ECANCELED;
#endif /* CONFIG_BT_CTLR_CONN_PARAM_REQ */ #endif /* CONFIG_BT_CTLR_CONN_PARAM_REQ */
case LLCP_CUI_STATE_OFFS_REQ: case LLCP_CUI_STATE_OFFS_REQ:
@ -2319,24 +2337,6 @@ static inline int event_conn_upd_prep(struct ll_conn *conn, uint16_t lazy,
ctrl_tx_enqueue(conn, tx); ctrl_tx_enqueue(conn, tx);
return -EINPROGRESS; return -EINPROGRESS;
case LLCP_CUI_STATE_REJECT:
/* procedure request acked */
conn->llcp_ack = conn->llcp_req;
conn->llcp_cu.ack = conn->llcp_cu.req;
conn->llcp_conn_param.ack = conn->llcp_conn_param.req;
/* reset mutex */
ull_conn_upd_curr_reset();
/* enqueue control PDU */
pdu_ctrl_tx =
CONTAINER_OF(conn->llcp.conn_upd.pdu_win_offset,
struct pdu_data,
llctrl.conn_update_ind.win_offset);
tx = CONTAINER_OF(pdu_ctrl_tx, struct node_tx, pdu);
ctrl_tx_enqueue(conn, tx);
return -ECANCELED;
default: default:
LL_ASSERT(0); LL_ASSERT(0);
break; break;