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

batman at open-mesh.org batman at open-mesh.org
Tue Jun 18 00:18:53 CEST 2013

The following commit has been merged in the master branch:
commit d5b4c93e67b0b1291aa8e2aaf694e40afc3412d0
Author: Simon Wunderlich <simon at open-mesh.com>
Date:   Fri Jun 7 16:52:05 2013 +0200

    batman-adv: Don't handle address updates when bla is disabled
    The bridge loop avoidance has a hook to handle address updates of the
    originator. These should not be handled when bridge loop avoidance is
    disabled - it might send some bridge loop avoidance packets which should
    not appear if bla is disabled.
    Signed-off-by: Simon Wunderlich <simon at open-mesh.com>
    Signed-off-by: Marek Lindner <lindner_marek at yahoo.de>
    Signed-off-by: Antonio Quartulli <ordex at autistici.org>

diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
index 379061c..de27b31 100644
--- a/net/batman-adv/bridge_loop_avoidance.c
+++ b/net/batman-adv/bridge_loop_avoidance.c
@@ -1067,6 +1067,10 @@ void batadv_bla_update_orig_address(struct batadv_priv *bat_priv,
 	group = htons(crc16(0, primary_if->net_dev->dev_addr, ETH_ALEN));
 	bat_priv->bla.claim_dest.group = group;
+	/* purge everything when bridge loop avoidance is turned off */
+	if (!atomic_read(&bat_priv->bridge_loop_avoidance))
+		oldif = NULL;
 	if (!oldif) {
 		batadv_bla_purge_claims(bat_priv, NULL, 1);
 		batadv_bla_purge_backbone_gw(bat_priv, 1);


More information about the linux-merge mailing list