From a02606cbf9d2d54e504262c725eb94fd08754941 Mon Sep 17 00:00:00 2001 From: Vinayak Kariappa Chettimada Date: Mon, 5 Feb 2018 05:42:50 +0100 Subject: [PATCH] Bluetooth: controller: Fix missing ticks to us conversion Fixed a missing ticks unit to microsecond unit conversion potentially caused incorrect window offsets being used while establishing connections. Signed-off-by: Vinayak Kariappa Chettimada --- subsys/bluetooth/controller/ll_sw/ctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subsys/bluetooth/controller/ll_sw/ctrl.c b/subsys/bluetooth/controller/ll_sw/ctrl.c index 7a9930d5769..f0ac86a8c0a 100644 --- a/subsys/bluetooth/controller/ll_sw/ctrl.c +++ b/subsys/bluetooth/controller/ll_sw/ctrl.c @@ -1428,7 +1428,7 @@ static inline u32_t isr_rx_scan(u8_t devmatch_ok, u8_t devmatch_id, pdu_adv_tx->connect_ind.win_offset = 0; } else { conn_space_us = _radio.scanner.win_offset_us + - ticks_slot_offset; + TICKER_TICKS_TO_US(ticks_slot_offset); while ((conn_space_us & ((u32_t)1 << 31)) || (conn_space_us < conn_offset_us)) { conn_space_us += conn_interval_us;