You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ry...@apache.org on 2019/01/17 05:34:37 UTC
[mynewt-nimble] branch master updated: nimble/ll: Fix rescheduling
connection
This is an automated email from the ASF dual-hosted git repository.
rymek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
The following commit(s) were added to refs/heads/master by this push:
new 1049b46 nimble/ll: Fix rescheduling connection
1049b46 is described below
commit 1049b46f82aa894dedaf33900096c84b23eb46d7
Author: Łukasz Rymanowski <lu...@codecoup.pl>
AuthorDate: Wed Jan 16 23:05:59 2019 +0100
nimble/ll: Fix rescheduling connection
Checking ble_ll_conn_is_lru() makes sense only for the
BLE_LL_SCHED_TYPE_CONN entry
---
nimble/controller/src/ble_ll_sched.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/nimble/controller/src/ble_ll_sched.c b/nimble/controller/src/ble_ll_sched.c
index ffdbf8e..0fce028 100644
--- a/nimble/controller/src/ble_ll_sched.c
+++ b/nimble/controller/src/ble_ll_sched.c
@@ -201,9 +201,8 @@ ble_ll_sched_conn_reschedule(struct ble_ll_conn_sm *connsm)
rc = 0;
TAILQ_FOREACH(entry, &g_ble_ll_sched_q, link) {
if (ble_ll_sched_is_overlap(sch, entry)) {
- if (entry->sched_type == BLE_LL_SCHED_TYPE_AUX_SCAN) {
- /* Do nothing, we start_mark overlap below */
- } else if (!ble_ll_conn_is_lru((struct ble_ll_conn_sm *)sch->cb_arg,
+ if (entry->sched_type == BLE_LL_SCHED_TYPE_CONN &&
+ !ble_ll_conn_is_lru((struct ble_ll_conn_sm *)sch->cb_arg,
(struct ble_ll_conn_sm *)entry->cb_arg)) {
/* Only insert if this element is older than all that we
* overlap