[linux-next] LinuxNextTracking branch, master, updated. next-20170614

batman at open-mesh.org batman at open-mesh.org
Thu Jun 15 00:15:38 CEST 2017


The following commit has been merged in the master branch:
commit 1227c9ae018b1d537349380cef8f6bbbf24082a6
Author: Simon Wunderlich <sw at simonwunderlich.de>
Date:   Thu Jun 1 17:11:24 2017 +0200

    batman-adv: do not add loop detection mac addresses to global tt
    
    This change has been made for local TT already, add another one for
    global TT - but only for temporary entries (aka speedy join), to prevent
    inconsistencies between local and global tables in case an older
    batman-adv version is still announcing those entries from its local
    table.
    
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>
    Signed-off-by: Sven Eckelmann <sven at narfation.org>

diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index e75b4937b497..4b64a9a633d9 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -4012,6 +4012,12 @@ bool batadv_tt_add_temporary_global_entry(struct batadv_priv *bat_priv,
 {
 	bool ret = false;
 
+	/* ignore loop detect macs, they are not supposed to be in the tt local
+	 * data as well.
+	 */
+	if (batadv_bla_is_loopdetect_mac(addr))
+		return false;
+
 	if (!batadv_tt_global_add(bat_priv, orig_node, addr, vid,
 				  BATADV_TT_CLIENT_TEMP,
 				  atomic_read(&orig_node->last_ttvn)))

-- 
LinuxNextTracking


More information about the linux-merge mailing list