iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

batman-adv: refactor tt_global_del() to avoid misalignment

Browse Source 
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:
Sven Eckelmann
2011-12-22 20:31:12 +08:00
committed by Marek Lindner
parent 032b7969f8
commit 92f90f56ca
1 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
net/batman-adv/translation-table.c
View File

@@ -657,11 +657,12 @@ void tt_global_del(struct bat_priv *bat_priv,
struct tt_local_entry *tt_local_entry = NULL; struct tt_local_entry *tt_local_entry = NULL;
tt_global_entry = tt_global_hash_find(bat_priv, addr); 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; 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 /* if we are deleting a global entry due to a roam
* event, there are two possibilities: * event, there are two possibilities:
* 1) the client roamed from node A to node B => we mark * 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; tt_global_entry->roam_at = jiffies;
goto out; goto out;
} }
}
out_del:
_tt_global_del(bat_priv, tt_global_entry, message); _tt_global_del(bat_priv, tt_global_entry, message);
}
out: out:
if (tt_global_entry) if (tt_global_entry)
tt_global_entry_free_ref(tt_global_entry); tt_global_entry_free_ref(tt_global_entry);