diff options
| author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2009-05-02 00:37:19 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-05-20 14:46:23 -0400 |
| commit | 768777ea1118f6ff3f1a013557e7bc4f5d2683a4 (patch) | |
| tree | e75a6d99b59773a933b4fcc6aaf995ad3b706440 /net | |
| parent | 689da1b3b8b37ff41e79f3fb973c06cdfeef12e5 (diff) | |
| download | kernel-crypto-768777ea1118f6ff3f1a013557e7bc4f5d2683a4.tar.gz kernel-crypto-768777ea1118f6ff3f1a013557e7bc4f5d2683a4.tar.xz kernel-crypto-768777ea1118f6ff3f1a013557e7bc4f5d2683a4.zip | |
mac80211: check if HT40+/- is allowed before sending assoc
We weren't checking this at all.
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/mlme.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index da582b643b9..a1944b8722e 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -121,10 +121,14 @@ 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: - channel_type = NL80211_CHAN_HT40PLUS; + if (!(local->hw.conf.channel->flags & + IEEE80211_CHAN_NO_HT40PLUS)) + channel_type = NL80211_CHAN_HT40PLUS; break; case IEEE80211_HT_PARAM_CHA_SEC_BELOW: - channel_type = NL80211_CHAN_HT40MINUS; + if (!(local->hw.conf.channel->flags & + IEEE80211_CHAN_NO_HT40MINUS)) + channel_type = NL80211_CHAN_HT40MINUS; break; } } |