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

batman at open-mesh.org batman at open-mesh.org
Wed Jan 16 00:20:29 CET 2013


The following commit has been merged in the master branch:
commit fa706554d6553331e886ce6fb86ca40b6dbc2083
Author: Antonio Quartulli <ordex at autistici.org>
Date:   Mon Nov 26 01:27:29 2012 +0100

    batman-adv: don't compile the BLA switch if not requested
    
    When the Bridge Loop Avoidance component is not compiled-in, its boolean switch
    should be not compiled as well. This patch surrounds the switch with a proper
    ifdef.
    
    This behaviour was introduced by 9fd6b0615b5499b270d39a92b8790e206cf75833
    ("batman-adv: add bridge loop avoidance compile option")
    
    Signed-off-by: Antonio Quartulli <ordex at autistici.org>
    Acked-by: Simon Wunderlich <siwu at hrz.tu-chemnitz.de>
    Signed-off-by: Marek Lindner <lindner_marek at yahoo.de>

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index f8cc142..57714f8 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -480,7 +480,9 @@ struct net_device *batadv_softif_create(const char *name)
 
 	atomic_set(&bat_priv->aggregated_ogms, 1);
 	atomic_set(&bat_priv->bonding, 0);
+#ifdef CONFIG_BATMAN_ADV_BLA
 	atomic_set(&bat_priv->bridge_loop_avoidance, 0);
+#endif
 #ifdef CONFIG_BATMAN_ADV_DAT
 	atomic_set(&bat_priv->distributed_arp_table, 1);
 #endif
diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
index ae9ac9a..030ce41 100644
--- a/net/batman-adv/types.h
+++ b/net/batman-adv/types.h
@@ -273,7 +273,9 @@ struct batadv_priv {
 	atomic_t bonding;		/* boolean */
 	atomic_t fragmentation;		/* boolean */
 	atomic_t ap_isolation;		/* boolean */
+#ifdef CONFIG_BATMAN_ADV_BLA
 	atomic_t bridge_loop_avoidance;	/* boolean */
+#endif
 #ifdef CONFIG_BATMAN_ADV_DAT
 	atomic_t distributed_arp_table;	/* boolean */
 #endif

-- 
LinuxNextTracking


More information about the linux-merge mailing list