diff options
author | Yogesh Ashok Powar <yogeshp@marvell.com> | 2011-05-12 09:32:17 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-05-12 09:32:17 -0400 |
commit | 4daf50f20256e0022c87c1609226e971a70c82fd (patch) | |
tree | 27b27980611aeb7d929c1e56380640dd0d2bf206 /net/mac80211/cfg.c | |
parent | bbe6ad6dcb1eb26bd12ec85320f402721c3383ae (diff) | |
download | op-kernel-dev-4daf50f20256e0022c87c1609226e971a70c82fd.zip op-kernel-dev-4daf50f20256e0022c87c1609226e971a70c82fd.tar.gz |
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>
Diffstat (limited to 'net/mac80211/cfg.c')
-rw-r--r-- | net/mac80211/cfg.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index a2ff474..ed3400c 100644 --- a/net/mac80211/cfg.c +++ b/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 } } |