linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* net/mac80211/cfg.c:746: error
@ 2011-05-12  9:44 Yogesh Ashok Powar
  2011-05-12 13:34 ` [PATCH] mac80211: Fix mesh-related build breakage John W. Linville
  0 siblings, 1 reply; 2+ messages in thread
From: Yogesh Ashok Powar @ 2011-05-12  9:44 UTC (permalink / raw)
  To: linux-wireless@vger.kernel.org; +Cc: John W. Linville

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

--

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [PATCH] mac80211: Fix mesh-related build breakage...
  2011-05-12  9:44 net/mac80211/cfg.c:746: error Yogesh Ashok Powar
@ 2011-05-12 13:34 ` John W. Linville
  0 siblings, 0 replies; 2+ messages in thread
From: John W. Linville @ 2011-05-12 13:34 UTC (permalink / raw)
  To: linux-wireless; +Cc: Yogesh Ashok Powar, John W. Linville

From: Yogesh Ashok Powar <yogeshp@marvell.com>

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


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-05-12 13:45 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-12  9:44 net/mac80211/cfg.c:746: error Yogesh Ashok Powar
2011-05-12 13:34 ` [PATCH] mac80211: Fix mesh-related build breakage John W. Linville

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).