From 95d55a2bfc2984cc39babd33d0c83355e70b96a7 Mon Sep 17 00:00:00 2001 From: Vinayak Kariappa Chettimada Date: Sat, 24 Jun 2017 21:57:25 +0200 Subject: [PATCH] Bluetooth: controller: Do not skip one-shot tickers with slot In preparation towards mesh advertise implementation, avoid one-shot tickers with slots, that have been scheduled to expire, from being removed by a forced start or update operation on another ticker. Signed-off-by: Vinayak Kariappa Chettimada --- subsys/bluetooth/controller/ticker/ticker.c | 1 + 1 file changed, 1 insertion(+) diff --git a/subsys/bluetooth/controller/ticker/ticker.c b/subsys/bluetooth/controller/ticker/ticker.c index c06ce41fd5a..10f0a19873b 100644 --- a/subsys/bluetooth/controller/ticker/ticker.c +++ b/subsys/bluetooth/controller/ticker/ticker.c @@ -789,6 +789,7 @@ static inline u32_t ticker_job_insert(struct ticker_instance *instance, ticker_collide = &node[id_collide]; if (ticker_collide->ticks_periodic && + ticker_collide->ticks_periodic && ticker_collide->force < ticker->force) { /* dequeue and get the reminder of ticks * to expire.