Skip to content

Commit 7295204

Browse files
cvinayaknashif
authored andcommitted
Bluetooth: controller: Fix CPR conditional compilation
Move the newly added Connection Parameter Request reject state implementation under conditional compilation. Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
1 parent 8044195 commit 7295204

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

subsys/bluetooth/controller/ll_sw/ull_conn.c

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2297,6 +2297,24 @@ static inline int event_conn_upd_prep(struct ll_conn *conn, uint16_t lazy,
22972297
case LLCP_CUI_STATE_SELECT:
22982298
fp_mfy_select_or_use = ull_sched_mfy_win_offset_select;
22992299
break;
2300+
2301+
case LLCP_CUI_STATE_REJECT:
2302+
/* procedure request acked */
2303+
conn->llcp_ack = conn->llcp_req;
2304+
conn->llcp_cu.ack = conn->llcp_cu.req;
2305+
conn->llcp_conn_param.ack = conn->llcp_conn_param.req;
2306+
2307+
/* reset mutex */
2308+
ull_conn_upd_curr_reset();
2309+
2310+
/* enqueue control PDU */
2311+
pdu_ctrl_tx =
2312+
CONTAINER_OF(conn->llcp.conn_upd.pdu_win_offset,
2313+
struct pdu_data,
2314+
llctrl.conn_update_ind.win_offset);
2315+
tx = CONTAINER_OF(pdu_ctrl_tx, struct node_tx, pdu);
2316+
ctrl_tx_enqueue(conn, tx);
2317+
return -ECANCELED;
23002318
#endif /* CONFIG_BT_CTLR_CONN_PARAM_REQ */
23012319

23022320
case LLCP_CUI_STATE_OFFS_REQ:
@@ -2319,24 +2337,6 @@ static inline int event_conn_upd_prep(struct ll_conn *conn, uint16_t lazy,
23192337
ctrl_tx_enqueue(conn, tx);
23202338
return -EINPROGRESS;
23212339

2322-
case LLCP_CUI_STATE_REJECT:
2323-
/* procedure request acked */
2324-
conn->llcp_ack = conn->llcp_req;
2325-
conn->llcp_cu.ack = conn->llcp_cu.req;
2326-
conn->llcp_conn_param.ack = conn->llcp_conn_param.req;
2327-
2328-
/* reset mutex */
2329-
ull_conn_upd_curr_reset();
2330-
2331-
/* enqueue control PDU */
2332-
pdu_ctrl_tx =
2333-
CONTAINER_OF(conn->llcp.conn_upd.pdu_win_offset,
2334-
struct pdu_data,
2335-
llctrl.conn_update_ind.win_offset);
2336-
tx = CONTAINER_OF(pdu_ctrl_tx, struct node_tx, pdu);
2337-
ctrl_tx_enqueue(conn, tx);
2338-
return -ECANCELED;
2339-
23402340
default:
23412341
LL_ASSERT(0);
23422342
break;

0 commit comments

Comments
 (0)