Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be73b488 authored by Antonio Quartulli's avatar Antonio Quartulli
Browse files

batman-adv: refactor tt_global_del_struct()



batadv_tt_global_del_struct() function is not properly named.
Having a more meaningful name which reflects the current behavior helps other
developers to easily understand what it does.

A parameter has also been renamed in order to let the function header better fit
the 80-chars line-width

Signed-off-by: default avatarAntonio Quartulli <ordex@autistici.org>
parent 47c94655
Loading
Loading
Loading
Loading
+9 −10
Original line number Original line Diff line number Diff line
@@ -927,18 +927,17 @@ batadv_tt_global_del_orig_entry(struct batadv_priv *bat_priv,
	spin_unlock_bh(&tt_global_entry->list_lock);
	spin_unlock_bh(&tt_global_entry->list_lock);
}
}


static void
static void batadv_tt_global_free(struct batadv_priv *bat_priv,
batadv_tt_global_del_struct(struct batadv_priv *bat_priv,
				  struct batadv_tt_global_entry *tt_global,
			    struct batadv_tt_global_entry *tt_global_entry,
				  const char *message)
				  const char *message)
{
{
	batadv_dbg(BATADV_DBG_TT, bat_priv,
	batadv_dbg(BATADV_DBG_TT, bat_priv,
		   "Deleting global tt entry %pM: %s\n",
		   "Deleting global tt entry %pM: %s\n",
		   tt_global_entry->common.addr, message);
		   tt_global->common.addr, message);


	batadv_hash_remove(bat_priv->tt.global_hash, batadv_compare_tt,
	batadv_hash_remove(bat_priv->tt.global_hash, batadv_compare_tt,
			   batadv_choose_orig, tt_global_entry->common.addr);
			   batadv_choose_orig, tt_global->common.addr);
	batadv_tt_global_entry_free_ref(tt_global_entry);
	batadv_tt_global_entry_free_ref(tt_global);


}
}


@@ -1002,7 +1001,7 @@ static void batadv_tt_global_del(struct batadv_priv *bat_priv,
						orig_node, message);
						orig_node, message);


		if (hlist_empty(&tt_global_entry->orig_list))
		if (hlist_empty(&tt_global_entry->orig_list))
			batadv_tt_global_del_struct(bat_priv, tt_global_entry,
			batadv_tt_global_free(bat_priv, tt_global_entry,
					      message);
					      message);


		goto out;
		goto out;
@@ -1026,7 +1025,7 @@ static void batadv_tt_global_del(struct batadv_priv *bat_priv,
	if (local_entry) {
	if (local_entry) {
		/* local entry exists, case 2: client roamed to us. */
		/* local entry exists, case 2: client roamed to us. */
		batadv_tt_global_del_orig_list(tt_global_entry);
		batadv_tt_global_del_orig_list(tt_global_entry);
		batadv_tt_global_del_struct(bat_priv, tt_global_entry, message);
		batadv_tt_global_free(bat_priv, tt_global_entry, message);
	} else
	} else
		/* no local entry exists, case 1: check for roaming */
		/* no local entry exists, case 1: check for roaming */
		batadv_tt_global_del_roaming(bat_priv, tt_global_entry,
		batadv_tt_global_del_roaming(bat_priv, tt_global_entry,