Repository : ssh://git@open-mesh.org/batman-adv

On branch : master

commit c13023b7d5f57494ebcd42ae4512afe0fc452383 Author: Antonio Quartulli ordex@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@autistici.org Acked-by: Simon Wunderlich siwu@hrz.tu-chemnitz.de

Signed-off-by: Marek Lindner lindner_marek@yahoo.de

c13023b7d5f57494ebcd42ae4512afe0fc452383 soft-interface.c | 2 ++ types.h | 2 ++ 2 files changed, 4 insertions(+)

diff --git a/soft-interface.c b/soft-interface.c index fcf8acc..adafa96 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -481,7 +481,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/types.h b/types.h index ae9ac9a..030ce41 100644 --- a/types.h +++ b/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