From 469d019b161ab1d4b2bd7a667de71ae4c785579b Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Wed, 5 May 2010 15:33:55 +0200
Subject: [PATCH] --- yaml --- r: 194764 b: refs/heads/master c:
 adfba3c7c026a6a5560d2a43fefc9b198cb74462 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/ibss.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e4d189fadbf5..cbeb608c542f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2c98382fee41848265c9bee1754b483045a740e
+refs/heads/master: adfba3c7c026a6a5560d2a43fefc9b198cb74462
diff --git a/trunk/net/mac80211/ibss.c b/trunk/net/mac80211/ibss.c
index ba752362b2b2..d5855ae387e8 100644
--- a/trunk/net/mac80211/ibss.c
+++ b/trunk/net/mac80211/ibss.c
@@ -907,6 +907,12 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata,
 	sdata->u.ibss.channel = params->channel;
 	sdata->u.ibss.fixed_channel = params->channel_fixed;
 
+	/* fix ourselves to that channel now already */
+	if (params->channel_fixed) {
+		sdata->local->oper_channel = params->channel;
+		sdata->local->oper_channel_type = NL80211_CHAN_NO_HT;
+	}
+
 	if (params->ie) {
 		sdata->u.ibss.ie = kmemdup(params->ie, params->ie_len,
 					   GFP_KERNEL);