michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: split: Fix check for control procedures request

Browse source 
Remove wrong #ifdef that guarded the control procedures request check

Signed-off-by: George Stefan <george.stefan@nxp.com>
This commit is contained in:
George Stefan 2019-11-20 15:37:00 +02:00 • committed by Carles Cufí
commit d2212581be
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -769,7 +769,6 @@ int ull_conn_llcp(struct ll_conn *conn, u32_t ticks_at_expire, u16_t lazy)
{ {
LL_ASSERT(conn->lll.handle != 0xFFFF); LL_ASSERT(conn->lll.handle != 0xFFFF);
#if defined(CONFIG_BT_CTLR_CONN_PARAM_REQ) || defined(CONFIG_BT_CTLR_PHY)
/* Check if no other procedure with instant is requested and not in /* Check if no other procedure with instant is requested and not in
* Encryption setup. * Encryption setup.
*/ */
@ -782,10 +781,8 @@ int ull_conn_llcp(struct ll_conn *conn, u32_t ticks_at_expire, u16_t lazy)
/* TODO: Optimize the checks below, maybe have common flag */ /* TODO: Optimize the checks below, maybe have common flag */
if (0) {
/* check if connection update procedure is requested */ /* check if connection update procedure is requested */
} else if (conn->llcp_cu.ack != conn->llcp_cu.req) { if (conn->llcp_cu.ack != conn->llcp_cu.req) {
/* switch to LLCP_CONN_UPD state machine */ /* switch to LLCP_CONN_UPD state machine */
conn->llcp_type = LLCP_CONN_UPD; conn->llcp_type = LLCP_CONN_UPD;
conn->llcp_ack -= 2U; conn->llcp_ack -= 2U;
@ -831,7 +828,6 @@ int ull_conn_llcp(struct ll_conn *conn, u32_t ticks_at_expire, u16_t lazy)
#endif /* CONFIG_BT_CTLR_PHY */ #endif /* CONFIG_BT_CTLR_PHY */
} }
} }
#endif /* CONFIG_BT_CTLR_CONN_PARAM_REQ || CONFIG_BT_CTLR_PHY */
/* check if procedure is requested */ /* check if procedure is requested */
if (((conn->llcp_req - conn->llcp_ack) & 0x03) == 0x02) { if (((conn->llcp_req - conn->llcp_ack) & 0x03) == 0x02) {