diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2010-05-05 09:33:55 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-05-05 15:10:57 -0400 |
commit | adfba3c7c026a6a5560d2a43fefc9b198cb74462 (patch) | |
tree | 59a29b19b377f1cd2c5022ed15b2e77398cc0fb5 /net/mac80211/ibss.c | |
parent | f2c98382fee41848265c9bee1754b483045a740e (diff) |
mac80211: use fixed channel in ibss join when appropriate
"mac80211: improve IBSS scanning" was missing a hunk.
This adds that hunk as originally intended.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/ibss.c')
-rw-r--r-- | net/mac80211/ibss.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index ba752362b2b2..d5855ae387e8 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c | |||
@@ -907,6 +907,12 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata, | |||
907 | sdata->u.ibss.channel = params->channel; | 907 | sdata->u.ibss.channel = params->channel; |
908 | sdata->u.ibss.fixed_channel = params->channel_fixed; | 908 | sdata->u.ibss.fixed_channel = params->channel_fixed; |
909 | 909 | ||
910 | /* fix ourselves to that channel now already */ | ||
911 | if (params->channel_fixed) { | ||
912 | sdata->local->oper_channel = params->channel; | ||
913 | sdata->local->oper_channel_type = NL80211_CHAN_NO_HT; | ||
914 | } | ||
915 | |||
910 | if (params->ie) { | 916 | if (params->ie) { |
911 | sdata->u.ibss.ie = kmemdup(params->ie, params->ie_len, | 917 | sdata->u.ibss.ie = kmemdup(params->ie, params->ie_len, |
912 | GFP_KERNEL); | 918 | GFP_KERNEL); |