Commit 768777ea authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

mac80211: check if HT40+/- is allowed before sending assoc 



We weren't checking this at all.

Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 689da1b3

net/mac80211/mlme.c

+6 −2
Original line number Diff line number Diff line
@@ -121,9 +121,13 @@ static u32 ieee80211_enable_ht(struct ieee80211_sub_if_data *sdata, 
		    (hti->ht_param & IEEE80211_HT_PARAM_CHAN_WIDTH_ANY)) {

			switch(hti->ht_param & IEEE80211_HT_PARAM_CHA_SEC_OFFSET) {

			case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:

				if (!(local->hw.conf.channel->flags &

				    IEEE80211_CHAN_NO_HT40PLUS))

					channel_type = NL80211_CHAN_HT40PLUS;

				break;

			case IEEE80211_HT_PARAM_CHA_SEC_BELOW:

				if (!(local->hw.conf.channel->flags &

				    IEEE80211_CHAN_NO_HT40MINUS))

					channel_type = NL80211_CHAN_HT40MINUS;

				break;

			}