[mynewt-nimble] branch master updated: nimble/ll/css: Fix updating css list

[an...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

andk 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 d16b023a nimble/ll/css: Fix updating css list
d16b023a is described below

commit d16b023a56b1691b9cc61448b7d0f60606e0bfe9
Author: Andrzej Kaczmarek <an...@codecoup.pl>
AuthorDate: Fri Nov 25 14:46:21 2022 +0100

    nimble/ll/css: Fix updating css list
    
    If connsm is already on css list and has slot index changed, the list
    may not be sorted properly so in some case item was not re-inseterd
    properly. To make things simpler, let's just remove item from the list
    and then find proper place for it bo be inserted, since doing both in
    single pass is too convoluted.
---
 nimble/controller/src/ble_ll_conn.c | 56 +++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/nimble/controller/src/ble_ll_conn.c b/nimble/controller/src/ble_ll_conn.c
index 5ca0997f..8e327f41 100644
--- a/nimble/controller/src/ble_ll_conn.c
+++ b/nimble/controller/src/ble_ll_conn.c
@@ -407,46 +407,48 @@ ble_ll_conn_cth_flow_process_cmd(const uint8_t *cmdbuf)
 static void
 ble_ll_conn_css_update_list(struct ble_ll_conn_sm *connsm)
 {
-    bool e_insert_found = false;
-    bool e_remove_found = false;
-    struct ble_ll_conn_sm *e_insert = NULL;
-    struct ble_ll_conn_sm *e_remove = NULL;
-    struct ble_ll_conn_sm *e_last = NULL;
     struct ble_ll_conn_sm *e;
+    struct ble_ll_conn_sm *e_last;
+    struct ble_ll_conn_sm *e_insert_after = NULL;
+    bool found_to_insert = false;
 
-    SLIST_FOREACH(e, &g_ble_ll_conn_css_list, css_sle) {
-        if (!e_remove_found && (e == connsm)) {
-            e_remove_found = true;
-            e_remove = e_last;
-        }
-        if (!e_insert_found && (e->css_slot_idx > connsm->css_slot_idx)) {
-            e_insert_found = true;
-            e_insert = e_last;
+    if (SLIST_FIRST(&g_ble_ll_conn_css_list) == connsm) {
+        SLIST_REMOVE_HEAD(&g_ble_ll_conn_css_list, css_sle);
+    } else {
+        e_last = NULL;
+        SLIST_FOREACH(e, &g_ble_ll_conn_css_list, css_sle) {
+            if (e == connsm) {
+                SLIST_NEXT(e_last, css_sle) = SLIST_NEXT(e, css_sle);
+                break;
+            }
+            e_last = e;
         }
+    }
 
-        if (e_insert_found && e_remove_found) {
+    if (SLIST_EMPTY(&g_ble_ll_conn_css_list)) {
+        SLIST_INSERT_HEAD(&g_ble_ll_conn_css_list, connsm, css_sle);
+        return;
+    }
+
+    e_last = NULL;
+    SLIST_FOREACH(e, &g_ble_ll_conn_css_list, css_sle) {
+        if (e->css_slot_idx > connsm->css_slot_idx) {
+            found_to_insert = true;
+            e_insert_after = e_last;
             break;
         }
 
         e_last = e;
     }
 
-    if (e_remove_found) {
-        if (e_remove == e_insert) {
-            return;
-        } else if (e_remove) {
-            SLIST_NEXT(e_remove, css_sle) = SLIST_NEXT(connsm, css_sle);
+    if (found_to_insert) {
+        if (e_insert_after) {
+            SLIST_INSERT_AFTER(e_last, connsm, css_sle);
         } else {
-            SLIST_REMOVE_HEAD(&g_ble_ll_conn_css_list, css_sle);
+            SLIST_INSERT_HEAD(&g_ble_ll_conn_css_list, connsm, css_sle);
         }
-    }
-
-    if (!e_insert_found && !e && e_last) {
-        SLIST_INSERT_AFTER(e_last, connsm, css_sle);
-    } else if (e_insert) {
-        SLIST_INSERT_AFTER(e_insert, connsm, css_sle);
     } else {
-        SLIST_INSERT_HEAD(&g_ble_ll_conn_css_list, connsm, css_sle);
+        SLIST_INSERT_AFTER(e_last, connsm, css_sle);
     }
 }