diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-12-04 11:29:10 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-12-04 11:29:10 -0500 |
commit | de51f1649ab77f9ad17bdad581a326cbf6e71b49 (patch) | |
tree | 82aa375e132b3c639afe239c4e49363636199827 /net/mac80211/rate.c | |
parent | 04bb7ecf8854186f47fb1ea321fc77e7bc931993 (diff) | |
parent | f027c2aca0cf43e0f15fc8de8841f7b566163d94 (diff) | |
download | linux-de51f1649ab77f9ad17bdad581a326cbf6e71b49.tar.bz2 |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg <johannes@sipsolutions.net> says:
"This time I have Felix's no-status rate control work, which will allow
drivers to work better with rate control even if they don't have perfect
status reporting. In addition to this, a small hwsim fix from Patrik,
one of the regulatory patches from Arik, and a number of cleanups and
fixes I did myself.
Of note is a patch where I disable CFG80211_WEXT so that compatibility
is no longer selectable - this is intended as a wake-up call for anyone
who's still using it, and is still easily worked around (it's a one-line
patch) before we fully remove the code as well in the future."
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/rate.c')
-rw-r--r-- | net/mac80211/rate.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c index 08ab7d6d1517..d53355b011f5 100644 --- a/net/mac80211/rate.c +++ b/net/mac80211/rate.c @@ -446,7 +446,8 @@ static void rate_fixup_ratelist(struct ieee80211_vif *vif, * * XXX: Should this check all retry rates? */ - if (!(rates[0].flags & IEEE80211_TX_RC_MCS)) { + if (!(rates[0].flags & + (IEEE80211_TX_RC_MCS | IEEE80211_TX_RC_VHT_MCS))) { u32 basic_rates = vif->bss_conf.basic_rates; s8 baserate = basic_rates ? ffs(basic_rates) - 1 : 0; |