2 files changed, 4 insertions, 0 deletions

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index f8cc1429942f..57714f83ede4 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 ae9ac9aca8c5..030ce412227e 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