projects
/
platform
/
kernel
/
kernel-mfld-blackbay.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cae6b74
)
mac80211: Fix compilation error when mesh is disabled
author
Javier Cardona
<javier@cozybit.com>
Tue, 7 Dec 2010 18:41:47 +0000
(10:41 -0800)
committer
John W. Linville
<linville@tuxdriver.com>
Tue, 7 Dec 2010 22:08:09 +0000
(17:08 -0500)
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>
net/mac80211/main.c
patch
|
blob
|
history
diff --git
a/net/mac80211/main.c
b/net/mac80211/main.c
index
2de6976
..
973fee9
100644
(file)
--- 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);