From e86a66a5b73e47141bca521ef153e3751aff1bdc Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
Date: Thu, 22 Dec 2011 20:31:12 +0800
Subject: [PATCH] --- yaml --- r: 290489 b: refs/heads/master c:
 92f90f56caa30dfcb6c5755776d73df23ef2ae1a h: refs/heads/master i:   290487:
 a1ad3fb619e459662b83f2cb8cba37993fbc79bb v: v3

---
 [refs]                                   |  2 +-
 trunk/net/batman-adv/translation-table.c | 42 +++++++++++++-----------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/[refs] b/[refs]
index 99c3e255f93c..e30b7e36bef5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 032b7969f8874d5ddc65691cd3d008beffd2a09e
+refs/heads/master: 92f90f56caa30dfcb6c5755776d73df23ef2ae1a
diff --git a/trunk/net/batman-adv/translation-table.c b/trunk/net/batman-adv/translation-table.c
index ff9a1b33c136..30c2d1b7de49 100644
--- a/trunk/net/batman-adv/translation-table.c
+++ b/trunk/net/batman-adv/translation-table.c
@@ -657,29 +657,31 @@ 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 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
-			 *    it with TT_CLIENT_ROAM, we start a timer and we
-			 *    wait for node B to claim it. In case of timeout
-			 *    the entry is purged.
-			 * 2) the client roamed to us => we can directly delete
-			 *    the global entry, since it is useless now. */
-			tt_local_entry = tt_local_hash_find(bat_priv,
-							    tt_global_entry->common.addr);
-			if (!tt_local_entry) {
-				tt_global_entry->common.flags |= TT_CLIENT_ROAM;
-				tt_global_entry->roam_at = jiffies;
-				goto out;
-			}
-		}
-		_tt_global_del(bat_priv, tt_global_entry, message);
+	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
+	 *    it with TT_CLIENT_ROAM, we start a timer and we
+	 *    wait for node B to claim it. In case of timeout
+	 *    the entry is purged.
+	 * 2) the client roamed to us => we can directly delete
+	 *    the global entry, since it is useless now. */
+	tt_local_entry = tt_local_hash_find(bat_priv,
+					    tt_global_entry->common.addr);
+	if (!tt_local_entry) {
+		tt_global_entry->common.flags |= TT_CLIENT_ROAM;
+		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);