diff options
| author | Javier Cardona <javier@cozybit.com> | 2010-12-07 10:41:47 -0800 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-12-07 17:08:09 -0500 |
| commit | 7659a193f94c0003dd06e9e874d19bade1a8c952 (patch) | |
| tree | a7f69f67f61f21ee7733f943ecedd1dceaac1a2e /net/mac80211 | |
| parent | cae6b74d907e2abd22d496fe30417b088d3302cf (diff) | |
| download | blackbird-obmc-linux-7659a193f94c0003dd06e9e874d19bade1a8c952.tar.gz blackbird-obmc-linux-7659a193f94c0003dd06e9e874d19bade1a8c952.zip | |
mac80211: Fix compilation error when mesh is disabled
Wrap mesh sections inside CONFIG_MAC80211_MESH to fix compilation
problems reported by Stephen Rothwell, Larry Finger and Bruno Randolf.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 2de69766c6aa..973fee9f7d69 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); |
