Commit adfba3c7 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

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: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f2c98382

net/mac80211/ibss.c

+6 −0
Original line number Diff line number Diff line
@@ -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);