From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 15 Nov 2014 02:48:54 +0000 (+0100)
Subject: mac80211: skip legacy rate mask handling for VHT rates
X-Git-Tag: v3.19-rc1~118^2~134^2~2^2~11
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=628c010f1f395459e6871e15b8dbd6f8c8045285;p=~emulex%2Finfiniband.git

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>
---

diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
index 6081329784d..f6fea67fcc5 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;