From 9c00891e2167bb18ceaa32a351a7cd2565383d57 Mon Sep 17 00:00:00 2001
From: Antonio Quartulli <ordex@autistici.org>
Date: Mon, 26 Nov 2012 01:27:29 +0100
Subject: [PATCH] --- yaml --- r: 351369 b: refs/heads/master c:
 fa706554d6553331e886ce6fb86ca40b6dbc2083 h: refs/heads/master i:   351367:
 5fbd50bab2769c9a15041f05b882ac3f8a284619 v: v3

---
 [refs]                                | 2 +-
 trunk/net/batman-adv/soft-interface.c | 2 ++
 trunk/net/batman-adv/types.h          | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 46b8c731a055..b419b8e1aa1d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f87c4239fa1df61beffbee2ca00e8ffbe31a5e3
+refs/heads/master: fa706554d6553331e886ce6fb86ca40b6dbc2083
diff --git a/trunk/net/batman-adv/soft-interface.c b/trunk/net/batman-adv/soft-interface.c
index f8cc1429942f..57714f83ede4 100644
--- a/trunk/net/batman-adv/soft-interface.c
+++ b/trunk/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/trunk/net/batman-adv/types.h b/trunk/net/batman-adv/types.h
index ae9ac9aca8c5..030ce412227e 100644
--- a/trunk/net/batman-adv/types.h
+++ b/trunk/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