The following commit has been merged in the master branch: commit c10dba051a3e287a4f023aaaeffa53fd642cf8c5 Author: Antonio Quartulli ordex@autistici.org Date: Sat Aug 11 11:11:00 2012 +0200

batman-adv: return proper value in case of hash_add failure

In case of hash_add failure tt_global_add() must return 0 (which means on entry insertion).

Signed-off-by: Antonio Quartulli ordex@autistici.org

diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index d87d9b4..42a74e3 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -776,13 +776,13 @@ int batadv_tt_global_add(struct batadv_priv *bat_priv, batadv_dbg(BATADV_DBG_TT, bat_priv, "Creating new global tt entry: %pM (via %pM)\n", tt_global_entry->common.addr, orig_node->orig); + ret = 1;

out_remove: /* remove address from local hash if present */ batadv_tt_local_remove(bat_priv, tt_global_entry->common.addr, "global tt received", flags & BATADV_TT_CLIENT_ROAM); - ret = 1; out: if (tt_global_entry) batadv_tt_global_entry_free_ref(tt_global_entry);