aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYogesh Ashok Powar <yogeshp@marvell.com>2011-05-12 09:32:17 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-05-12 09:32:17 -0400
commit4daf50f20256e0022c87c1609226e971a70c82fd (patch)
tree27b27980611aeb7d929c1e56380640dd0d2bf206
parentbbe6ad6dcb1eb26bd12ec85320f402721c3383ae (diff)
mac80211: Fix mesh-related build breakage...
net/mac80211/cfg.c: In function ‘sta_apply_parameters’: net/mac80211/cfg.c:746: error: ‘struct sta_info’ has no member named ‘plink_state’ make[1]: *** [net/mac80211/cfg.o] Error 1 make: *** [net/mac80211/mac80211.ko] Error 2 Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--net/mac80211/cfg.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index a2ff47493e0a..ed3400cd7a5a 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -738,6 +738,7 @@ static void sta_apply_parameters(struct ieee80211_local *local,
738 &sta->sta.ht_cap); 738 &sta->sta.ht_cap);
739 739
740 if (ieee80211_vif_is_mesh(&sdata->vif)) { 740 if (ieee80211_vif_is_mesh(&sdata->vif)) {
741#ifdef CONFIG_MAC80211_MESH
741 if (sdata->u.mesh.security & IEEE80211_MESH_SEC_SECURED) 742 if (sdata->u.mesh.security & IEEE80211_MESH_SEC_SECURED)
742 switch (params->plink_state) { 743 switch (params->plink_state) {
743 case PLINK_LISTEN: 744 case PLINK_LISTEN:
@@ -758,6 +759,7 @@ static void sta_apply_parameters(struct ieee80211_local *local,
758 mesh_plink_block(sta); 759 mesh_plink_block(sta);
759 break; 760 break;
760 } 761 }
762#endif
761 } 763 }
762} 764}
763 765