[PATCH net-next 04/15] batman-adv: tt: extract refresh of existing local entries
flat view
COLD37d
From: Simon Wunderlich <sw@simonwunderlich.de>
Date: 2026-09-07 08:18:36
Also in:
batman
Subsystem:
batman advanced, the rest · Maintainers:
Marek Lindner, Simon Wunderlich, Antonio Quartulli, Sven Eckelmann, Linus Torvalds
From: Sven Eckelmann <sven@narfation.org> The handling of a client which is already part of the local translation table is independent from the rest of batadv_tt_local_add(): it only refreshes last_seen and evaluates the PENDING and ROAM flags of the entry which was just looked up. Move it to batadv_tt_local_add_existing(). It reports via its return value whether the client has to be announced to the mesh again and whether the client roamed back to its original location. Signed-off-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de> --- net/batman-adv/translation-table.c | 78 +++++++++++++++++++----------- 1 file changed, 51 insertions(+), 27 deletions(-)
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index 5d5f270b7eb4c..91e11e5f10140 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c@@ -720,6 +720,55 @@ static bool batadv_tt_iif_is_wifi(struct net *net, int ifindex) return batadv_is_wifi(wifi_flags); } +/** + * batadv_tt_local_add_existing() - refresh an already known local TT entry + * @bat_priv: the bat priv with all the mesh interface information + * @tt_local: the local TT entry which was found in the local table + * @roamed_back: set to true when the client returned to its original location + * + * Return: true when the client has to be announced to the mesh again, false + * otherwise. + */ +static bool batadv_tt_local_add_existing(struct batadv_priv *bat_priv, + struct batadv_tt_local_entry *tt_local, + bool *roamed_back) +{ + struct batadv_tt_common_entry *common = &tt_local->common; + + tt_local->last_seen = jiffies; + + scoped_guard(spinlock_bh, &common->flags_lock) { + if (common->flags & BATADV_TT_CLIENT_PENDING) { + batadv_dbg(BATADV_DBG_TT, bat_priv, + "Re-adding pending client %pM (vid: %d)\n", + common->addr, batadv_print_vid(common->vid)); + /* whatever the reason why the PENDING flag was set, + * this is a client which was enqueued to be removed in + * this orig_interval. Since it popped up again, the + * flag can be reset like it was never enqueued + */ + common->flags &= ~BATADV_TT_CLIENT_PENDING; + + return true; + } + + if (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", + common->addr, batadv_print_vid(common->vid)); + /* the ROAM flag is set because this client roamed away + * and the node got a roaming_advertisement message. Now + * that the client popped up again at its original + * location such flag can be unset + */ + common->flags &= ~BATADV_TT_CLIENT_ROAM; + *roamed_back = true; + } + } + + return false; +} + /** * batadv_tt_local_create() - allocate and initialize a local TT entry * @mesh_iface: netdev struct of the mesh interface
@@ -834,33 +883,8 @@ bool batadv_tt_local_add(struct net_device *mesh_iface, const u8 *addr, tt_global = batadv_tt_global_hash_find(bat_priv, addr, vid); if (tt_local) { - tt_local->last_seen = jiffies; - - spin_lock_bh(&tt_local->common.flags_lock); - if (tt_local->common.flags & BATADV_TT_CLIENT_PENDING) { - batadv_dbg(BATADV_DBG_TT, bat_priv, - "Re-adding pending client %pM (vid: %d)\n", - addr, batadv_print_vid(vid)); - /* whatever the reason why the PENDING flag was set, - * this is a client which was enqueued to be removed in - * this orig_interval. Since it popped up again, the - * flag can be reset like it was never enqueued - */ - tt_local->common.flags &= ~BATADV_TT_CLIENT_PENDING; - 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)); - /* the ROAM flag is set because this client roamed away - * and the node got a roaming_advertisement message. Now - * that the client popped up again at its original - * location such flag can be unset - */ - tt_local->common.flags &= ~BATADV_TT_CLIENT_ROAM; - roamed_back = true; - } - spin_unlock_bh(&tt_local->common.flags_lock); + added = batadv_tt_local_add_existing(bat_priv, tt_local, + &roamed_back); } else { tt_local = batadv_tt_local_create(mesh_iface, addr, vid, iif_is_wifi); if (!tt_local)
--
2.47.3