summaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-11-15 03:48:54 +0100
committerJohannes Berg <johannes.berg@intel.com>2014-11-19 18:46:35 +0100
commit628c010f1f395459e6871e15b8dbd6f8c8045285 (patch)
tree848c5dded518fad1400c9ab2a315fc7ad1105e0e /net/mac80211
parent8b1956f0416f10c2362532a9f87c9f1afc70347c (diff)
downloadlinux-628c010f1f395459e6871e15b8dbd6f8c8045285.tar.bz2
mac80211: skip legacy rate mask handling for VHT rates
The rate mask code currently assumes that a rate is legacy if IEEE80211_TX_RC_MCS is not set. This might be the cause of bogus VHT rates being reported with minstrel_ht. Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/rate.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
index 6081329784dd..f6fea67fcc5b 100644
--- a/net/mac80211/rate.c
+++ b/net/mac80211/rate.c
@@ -385,7 +385,7 @@ static void rate_idx_match_mask(struct ieee80211_tx_rate *rate,
*rate = alt_rate;
return;
}
- } else {
+ } else if (!(rate->flags & IEEE80211_TX_RC_VHT_MCS)) {
/* handle legacy rates */
if (rate_idx_match_legacy_mask(rate, sband->n_bitrates, mask))
return;