From b7e35ae4a323c40b4bec6646aa62a847b5518e90 Mon Sep 17 00:00:00 2001 From: Vinayak Kariappa Chettimada Date: Thu, 26 Mar 2020 18:06:27 +0530 Subject: [PATCH] Bluetooth: controller: legacy: Fix slave latency during conn update Fix regression in cancelling slave latency during Connection Update Procedure. Slave latency should not be applied between the ack of a Connection Update Indication PDU and until the instant. When caching was introduced, implementation missed this consideration. Signed-off-by: Vinayak Kariappa Chettimada --- subsys/bluetooth/controller/ll_sw/ctrl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/subsys/bluetooth/controller/ll_sw/ctrl.c b/subsys/bluetooth/controller/ll_sw/ctrl.c index 860976c00fa..ff5291fc504 100644 --- a/subsys/bluetooth/controller/ll_sw/ctrl.c +++ b/subsys/bluetooth/controller/ll_sw/ctrl.c @@ -4904,9 +4904,10 @@ static inline void isr_close_conn(void) #endif /* CONFIG_BT_CTLR_CONN_RSSI */ /* break latency based on ctrl procedure pending */ - if ((_radio.conn_curr->llcp_ack != _radio.conn_curr->llcp_req) && - ((_radio.conn_curr->llcp_type == LLCP_CONN_UPD) || - (_radio.conn_curr->llcp_type == LLCP_CHAN_MAP))) { + if (((_radio.conn_curr->llcp_ack != _radio.conn_curr->llcp_req) && + ((_radio.conn_curr->llcp_type == LLCP_CONN_UPD) || + (_radio.conn_curr->llcp_type == LLCP_CHAN_MAP))) || + (_radio.conn_curr->llcp_cu.req != _radio.conn_curr->llcp_cu.ack)) { _radio.conn_curr->latency_event = 0U; }