diff options
| author | Simon Wunderlich <simon.wunderlich@s2003.tu-chemnitz.de> | 2013-05-16 13:00:31 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-06-18 16:17:11 +0200 |
| commit | 0418a445838749c51cf1e31a9c7ace6685ae87cd (patch) | |
| tree | 17efafeb21d138dbd8f7a7af01e07a8446298126 /net/mac80211/rate.c | |
| parent | 30e747326378caec9ad13515bc9bde2e41b1fee3 (diff) | |
mac80211: fix various components for the new 5 and 10 MHz widths
This is a collection of minor fixes:
* don't allow HT IEs in IBSS for 5/10 MHz
* don't allow HT IEs in Mesh for 5/10 MHz
* don't downgrade from/to 5 and 10 MHz channels
* don't try HT rates for 5 and 10 MHz channels when selecting rates
Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: Mathias Kretschmer <mathias.kretschmer@fokus.fraunhofer.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/rate.c')
| -rw-r--r-- | net/mac80211/rate.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c index d3f414fe67e..dbbcd57b0fc 100644 --- a/net/mac80211/rate.c +++ b/net/mac80211/rate.c @@ -397,8 +397,14 @@ static void rate_idx_match_mask(struct ieee80211_tx_rate *rate, return; /* if HT BSS, and we handle a data frame, also try HT rates */ - if (chan_width == NL80211_CHAN_WIDTH_20_NOHT) + switch (chan_width) { + case NL80211_CHAN_WIDTH_20_NOHT: + case NL80211_CHAN_WIDTH_5: + case NL80211_CHAN_WIDTH_10: return; + default: + break; + } alt_rate.idx = 0; /* keep protection flags */ |