2011-05-12 09:54:21

by Yogesh Ashok Powar

Subject: net/mac80211/cfg.c:746: error

Hello,
Have seen following error during the compilation

>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

May be following is the fix

Thanks
Yogesh

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
}
}

--

2011-05-12 13:45:52

by John W. Linville

Subject: [PATCH] mac80211: Fix mesh-related build breakage...

From: Yogesh Ashok Powar <[email protected]>

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 <[email protected]>
---
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
}
}

--
1.7.4.4