From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <simon.wunderlich@s2003.tu-chemnitz.de>
Date: Mon, 26 Nov 2012 11:35:31 +0100
From: Simon Wunderlich <simon.wunderlich@s2003.tu-chemnitz.de>
Message-ID: <20121126103531.GA23570@pandem0nium>
References: <1353889649-19264-1-git-send-email-ordex@autistici.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature"; boundary="ew6BAiZeqk4r7MaW"
Content-Disposition: inline
In-Reply-To: <1353889649-19264-1-git-send-email-ordex@autistici.org>
Subject: Re: [B.A.T.M.A.N.] [PATCH] batman-adv: don't compile the BLA switch
 if not requested
Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking
 <b.a.t.m.a.n@lists.open-mesh.org>
List-Id: The list for a Better Approach To Mobile Ad-hoc Networking
 <b.a.t.m.a.n.lists.open-mesh.org>
List-Unsubscribe: <https://lists.open-mesh.org/mm/options/b.a.t.m.a.n>,
 <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=unsubscribe>
List-Archive: <http://lists.open-mesh.org/pipermail/b.a.t.m.a.n/>
List-Post: <mailto:b.a.t.m.a.n@lists.open-mesh.org>
List-Help: <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=help>
List-Subscribe: <https://lists.open-mesh.org/mm/listinfo/b.a.t.m.a.n>,
 <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=subscribe>
To: The list for a Better Approach To Mobile Ad-hoc Networking <b.a.t.m.a.n@lists.open-mesh.org>


--ew6BAiZeqk4r7MaW
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

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 pr=
oper
> ifdef.
>=20
> This behaviour was introduced by 9fd6b0615b5499b270d39a92b8790e206cf75833
> ("batman-adv: add bridge loop avoidance compile option")
>=20
> 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(+)
>=20
> 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 *n=
ame)
> =20
>  	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
> --=20
> 1.8.0
>=20
>=20

--ew6BAiZeqk4r7MaW
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEARECAAYFAlCzRfMACgkQrzg/fFk7axbArwCfbwEE4GMmCpBY5R4F0amhYdyC
dLAAoNNpy2sXA9eqRpmXbnEs5RYxqGnv
=QYpQ
-----END PGP SIGNATURE-----

--ew6BAiZeqk4r7MaW--