---

yaml --- r: 194764 b: refs/heads/master c: adfba3c h: refs/heads/master v: v3
git-mirror · May 5, 2010 · 469d019 · 469d019
1 parent 82d355f
commit 469d019
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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);