From 0bc098870ee4325152236f5388150a7b8e04ad1e Mon Sep 17 00:00:00 2001
From: Javier Cardona <javier@cozybit.com>
Date: Tue, 7 Dec 2010 10:41:47 -0800
Subject: [PATCH] --- yaml --- r: 225129 b: refs/heads/master c:
 7659a193f94c0003dd06e9e874d19bade1a8c952 h: refs/heads/master i:   225127:
 bf0fca8237d040beefac258a4d472d7aab75f8b7 v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/main.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 771b68f47626..afb2199dc515 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cae6b74d907e2abd22d496fe30417b088d3302cf
+refs/heads/master: 7659a193f94c0003dd06e9e874d19bade1a8c952
diff --git a/trunk/net/mac80211/main.c b/trunk/net/mac80211/main.c
index 2de69766c6aa..973fee9f7d69 100644
--- a/trunk/net/mac80211/main.c
+++ b/trunk/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);