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

batman at open-mesh.org batman at open-mesh.org
Tue Jan 14 00:19:34 CET 2014

The following commit has been merged in the master branch:
commit 2d2fcc2a3ff79de1fa3fba10f88c324d769392af
Author: Antonio Quartulli <antonio at open-mesh.com>
Date:   Sat Nov 16 12:03:50 2013 +0100

    batman-adv: extend the ap_isolation mechanism
    Change the AP isolation mechanism to not only "isolate" WIFI
    clients but also all those marked with the more generic
    "isolation flag" (BATADV_TT_CLIENT_ISOLA).
    The result is that when AP isolation is on any unicast
    packet originated by an "isolated" client and directed to
    another "isolated" client is dropped at the source node.
    Signed-off-by: Antonio Quartulli <antonio at open-mesh.com>
    Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>

diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index eeceb13..a874d08 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -1869,6 +1869,11 @@ _batadv_is_ap_isolated(struct batadv_tt_local_entry *tt_local_entry,
 	    tt_global_entry->common.flags & BATADV_TT_CLIENT_WIFI)
 		ret = true;
+	/* check if the two clients are marked as isolated */
+	if (tt_local_entry->common.flags & BATADV_TT_CLIENT_ISOLA &&
+	    tt_global_entry->common.flags & BATADV_TT_CLIENT_ISOLA)
+		ret = true;
 	return ret;


More information about the linux-merge mailing list