lkml.org 
[lkml]   [2011]   [May]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subjectlinux-next: build failure after merge of the final tree (wireless tree related)
Hi John,

After merging the final tree, today's linux-next build (i386 defconfig)
failed like this:

net/mac80211/cfg.c: In function 'sta_apply_parameters':
net/mac80211/cfg.c:746: error: 'struct sta_info' has no member named 'plink_state'

Cause by commit 9c3990aaec0a ("nl80211: Let userspace drive the peer link
management states"). plink_state is only available in sta_info if
CONFIG_MAC80211_MESH is set.

I applied the following patch for today (which my not be correct).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 12 May 2011 14:06:31 +1000
Subject: [PATCH] nl80211: fix for reference to sta_info -> plink_state

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
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..e090012 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -743,7 +743,9 @@ static void sta_apply_parameters(struct ieee80211_local *local,
case PLINK_LISTEN:
case PLINK_ESTAB:
case PLINK_BLOCKED:
+#ifdef CONFIG_MAC80211_MESH
sta->plink_state = params->plink_state;
+#endif
break;
default:
/* nothing */
--
1.7.5.1
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/


\
 
 \ /
  Last update: 2011-05-12 06:45    [W:0.060 / U:0.320 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site