From f3de1f5b38305315584b47f3c96653a91636f4ff Mon Sep 17 00:00:00 2001 From: Wolfgang Puffitsch Date: Mon, 16 Mar 2020 12:34:33 +0100 Subject: [PATCH] Bluetooth: controller: split: Fix response to unexpected LL_FEATURE_RSP Fix response to unexpected LL_FEATURE_RSP for the case that BT_CTLR_SLAVE_FEAT_REQ is disabled. Fixes LL/PAC/SLA/BV-01 for such a configuration. Signed-off-by: Wolfgang Puffitsch --- subsys/bluetooth/controller/ll_sw/ull_conn.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/subsys/bluetooth/controller/ll_sw/ull_conn.c b/subsys/bluetooth/controller/ll_sw/ull_conn.c index a816e6da9ac..51376c7d135 100644 --- a/subsys/bluetooth/controller/ll_sw/ull_conn.c +++ b/subsys/bluetooth/controller/ll_sw/ull_conn.c @@ -5407,7 +5407,9 @@ static inline int ctrl_rx(memq_link_t *link, struct node_rx_pdu **rx, #endif /* CONFIG_BT_CTLR_SLAVE_FEAT_REQ */ case PDU_DATA_LLCTRL_TYPE_FEATURE_RSP: - if (!pdu_len_cmp(PDU_DATA_LLCTRL_TYPE_FEATURE_RSP, + if ((!IS_ENABLED(CONFIG_BT_CTLR_SLAVE_FEAT_REQ) && + conn->lll.role) || + !pdu_len_cmp(PDU_DATA_LLCTRL_TYPE_FEATURE_RSP, pdu_rx->len)) { goto ull_conn_rx_unknown_rsp_send; }