From a2f4fe7c7ceeb36d9c9e7e67fe87945d259b2da8 Mon Sep 17 00:00:00 2001
From: Yogesh Ashok Powar <yogeshp@marvell.com>
Date: Thu, 12 May 2011 09:32:17 -0400
Subject: [PATCH] --- yaml --- r: 247618 b: refs/heads/master c:
 4daf50f20256e0022c87c1609226e971a70c82fd h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 63c61e3d68dd..56829b3ed78d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bbe6ad6dcb1eb26bd12ec85320f402721c3383ae
+refs/heads/master: 4daf50f20256e0022c87c1609226e971a70c82fd
diff --git a/trunk/net/mac80211/cfg.c b/trunk/net/mac80211/cfg.c
index a2ff47493e0a..ed3400cd7a5a 100644
--- a/trunk/net/mac80211/cfg.c
+++ b/trunk/net/mac80211/cfg.c
@@ -738,6 +738,7 @@ static void sta_apply_parameters(struct ieee80211_local *local,
 						  &sta->sta.ht_cap);
 
 	if (ieee80211_vif_is_mesh(&sdata->vif)) {
+#ifdef CONFIG_MAC80211_MESH
 		if (sdata->u.mesh.security & IEEE80211_MESH_SEC_SECURED)
 			switch (params->plink_state) {
 			case PLINK_LISTEN:
@@ -758,6 +759,7 @@ static void sta_apply_parameters(struct ieee80211_local *local,
 				mesh_plink_block(sta);
 				break;
 			}
+#endif
 	}
 }