* [B.A.T.M.A.N.] [PATCH] batman-adv: don't compile the BLA switch if not requested
@ 2012-11-26 0:27 Antonio Quartulli
2012-11-26 10:35 ` Simon Wunderlich
0 siblings, 1 reply; 3+ messages in thread
From: Antonio Quartulli @ 2012-11-26 0:27 UTC (permalink / raw)
To: b.a.t.m.a.n
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>
---
soft-interface.c | 2 ++
types.h | 2 ++
2 files changed, 4 insertions(+)
diff --git a/soft-interface.c b/soft-interface.c
index 8000639..aa34267 100644
--- a/soft-interface.c
+++ b/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/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
--
1.8.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [B.A.T.M.A.N.] [PATCH] batman-adv: don't compile the BLA switch if not requested
2012-11-26 0:27 [B.A.T.M.A.N.] [PATCH] batman-adv: don't compile the BLA switch if not requested Antonio Quartulli
@ 2012-11-26 10:35 ` Simon Wunderlich
2012-12-01 15:32 ` Marek Lindner
0 siblings, 1 reply; 3+ messages in thread
From: Simon Wunderlich @ 2012-11-26 10:35 UTC (permalink / raw)
To: The list for a Better Approach To Mobile Ad-hoc Networking
[-- Attachment #1: Type: text/plain, Size: 1598 bytes --]
On Mon, Nov 26, 2012 at 01:27:29AM +0100, Antonio Quartulli wrote:
> 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>
> ---
> soft-interface.c | 2 ++
> types.h | 2 ++
> 2 files changed, 4 insertions(+)
>
> diff --git a/soft-interface.c b/soft-interface.c
> index 8000639..aa34267 100644
> --- a/soft-interface.c
> +++ b/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/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
> --
> 1.8.0
>
>
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [B.A.T.M.A.N.] [PATCH] batman-adv: don't compile the BLA switch if not requested
2012-11-26 10:35 ` Simon Wunderlich
@ 2012-12-01 15:32 ` Marek Lindner
0 siblings, 0 replies; 3+ messages in thread
From: Marek Lindner @ 2012-12-01 15:32 UTC (permalink / raw)
To: b.a.t.m.a.n
On Monday, November 26, 2012 18:35:31 Simon Wunderlich wrote:
> On Mon, Nov 26, 2012 at 01:27:29AM +0100, Antonio Quartulli wrote:
> > 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>
Applied in revision c13023b.
Thanks,
Marek
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-12-01 15:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-26 0:27 [B.A.T.M.A.N.] [PATCH] batman-adv: don't compile the BLA switch if not requested Antonio Quartulli
2012-11-26 10:35 ` Simon Wunderlich
2012-12-01 15:32 ` Marek Lindner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox