Re: build error without CONFIG_MAC80211_MESH

[Larry Finger <Larry.Finger@lwfinger.net>]

On 12/06/2010 08:23 PM, Bruno Randolf wrote:
> Hi!
> 
> Building current wireless-testing (master-2010-12-06) without the Mesh option 
> is broken:
> 
>   CC [M]  net/mac80211/main.o
> /home/br1/ath/wireless-testing/net/mac80211/main.c: In function 
> ‘ieee80211_bss_info_change_notify’:
> /home/br1/ath/wireless-testing/net/mac80211/main.c:250: error: ‘union 
> <anonymous>’ has no member named ‘mesh’
> make[3]: *** [net/mac80211/main.o] Error 1
> make[2]: *** [net/mac80211] Error 2
> make[1]: *** [net] Error 2
> make: *** [sub-make] Error 2
> 
> It needs something like:
> 
> diff --git a/net/mac80211/main.c b/net/mac80211/main.c
> index 40bd12e..3d988ca 100644
> --- a/net/mac80211/main.c
> +++ b/net/mac80211/main.c
> @@ -245,10 +245,12 @@ void ieee80211_bss_info_change_notify(struct 
> ieee80211_sub_if_data *sdata,
>                                 sdata->vif.bss_conf.enable_beacon =
>                                         !!sdata->u.ibss.presp;
>                                 break;
> +#ifdef CONFIG_MAC80211_MESH
>                         case NL80211_IFTYPE_MESH_POINT:
>                                 sdata->vif.bss_conf.enable_beacon =
>                                         !!sdata->u.mesh.mesh_id_len;
>                                 break;
> +#endif
>                         default:
>                                 /* not reached */
>                                 WARN_ON(1);

Happens here too.

Larry