From a5e5d2709d1001279093fd298101eb9d875a8ba0 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Sun, 30 Aug 2026 17:21:48 +0200 Subject: [PATCH] batman-adv: tt: replace forward gotos in batadv_tt_local_add() batadv_tt_local_add() used two labels in the middle of the function to express which parts of the common tail have to be executed: "add_event" to announce a (re-)added client and "check_roaming" to skip that announcement. Jumping forward into the middle of a function makes it hard to see which path ends up sending an ADD event. Especially since the PENDING branch reached "add_event" while the branch right below it reached "check_roaming" instead. Express the same in an "added" variable and turn the two client cases into a plain if/else. The PENDING check returned early before the ROAM check could run, so it becomes an "else if". Signed-off-by: Sven Eckelmann --- net/batman-adv/translation-table.c | 47 ++++++++++++++---------------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 2bc243f0fa69..5d5f270b7eb4 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -818,6 +818,7 @@ bool batadv_tt_local_add(struct net_device *mesh_iface, const u8 *addr, struct batadv_tt_global_entry *tt_global = NULL; struct batadv_tt_local_entry *tt_local; bool roamed_back = false; + bool added = false; bool iif_is_wifi; bool ret = false; u8 remote_flags; @@ -846,12 +847,8 @@ bool batadv_tt_local_add(struct net_device *mesh_iface, const u8 *addr, * flag can be reset like it was never enqueued */ tt_local->common.flags &= ~BATADV_TT_CLIENT_PENDING; - spin_unlock_bh(&tt_local->common.flags_lock); - - goto add_event; - } - - if (tt_local->common.flags & BATADV_TT_CLIENT_ROAM) { + added = true; + } else if (tt_local->common.flags & BATADV_TT_CLIENT_ROAM) { batadv_dbg(BATADV_DBG_TT, bat_priv, "Roaming client %pM (vid: %d) came back to its original location\n", addr, batadv_print_vid(vid)); @@ -864,29 +861,29 @@ bool batadv_tt_local_add(struct net_device *mesh_iface, const u8 *addr, roamed_back = true; } spin_unlock_bh(&tt_local->common.flags_lock); + } else { + tt_local = batadv_tt_local_create(mesh_iface, addr, vid, iif_is_wifi); + if (!tt_local) + goto out; - goto check_roaming; + kref_get(&tt_local->common.refcount); + hash_added = batadv_hash_add(bat_priv->tt.local_hash, batadv_compare_tt, + batadv_choose_tt, &tt_local->common, + &tt_local->common.hash_entry); + + if (unlikely(hash_added != 0)) { + /* remove the reference for the hash */ + batadv_tt_local_entry_put(tt_local); + goto out; + } + + added = true; } - tt_local = batadv_tt_local_create(mesh_iface, addr, vid, iif_is_wifi); - if (!tt_local) - goto out; + /* announce the (re-)added client to the mesh */ + if (added) + batadv_tt_local_event(bat_priv, tt_local, BATADV_NO_FLAGS); - kref_get(&tt_local->common.refcount); - hash_added = batadv_hash_add(bat_priv->tt.local_hash, batadv_compare_tt, - batadv_choose_tt, &tt_local->common, - &tt_local->common.hash_entry); - - if (unlikely(hash_added != 0)) { - /* remove the reference for the hash */ - batadv_tt_local_entry_put(tt_local); - goto out; - } - -add_event: - batadv_tt_local_event(bat_priv, tt_local, BATADV_NO_FLAGS); - -check_roaming: batadv_tt_local_add_roam(bat_priv, tt_global, roamed_back); spin_lock_bh(&tt_local->common.flags_lock);