forked from luck/tmp_suning_uos_patched
batman-adv: refactor tt_global_del() to avoid misalignment
Signed-off-by: Sven Eckelmann <sven@narfation.org> Acked-by: Antonio Quartulli <ordex@autistici.org> Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
This commit is contained in:
parent
032b7969f8
commit
92f90f56ca
@ -657,11 +657,12 @@ void tt_global_del(struct bat_priv *bat_priv,
|
||||
struct tt_local_entry *tt_local_entry = NULL;
|
||||
|
||||
tt_global_entry = tt_global_hash_find(bat_priv, addr);
|
||||
if (!tt_global_entry)
|
||||
if (!tt_global_entry || tt_global_entry->orig_node != orig_node)
|
||||
goto out;
|
||||
|
||||
if (tt_global_entry->orig_node == orig_node) {
|
||||
if (roaming) {
|
||||
if (!roaming)
|
||||
goto out_del;
|
||||
|
||||
/* if we are deleting a global entry due to a roam
|
||||
* event, there are two possibilities:
|
||||
* 1) the client roamed from node A to node B => we mark
|
||||
@ -677,9 +678,10 @@ void tt_global_del(struct bat_priv *bat_priv,
|
||||
tt_global_entry->roam_at = jiffies;
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
|
||||
out_del:
|
||||
_tt_global_del(bat_priv, tt_global_entry, message);
|
||||
}
|
||||
|
||||
out:
|
||||
if (tt_global_entry)
|
||||
tt_global_entry_free_ref(tt_global_entry);
|
||||
|
Loading…
Reference in New Issue
Block a user