diff options
| author | Karl Beldan <karl.beldan@rivierawaves.com> | 2014-10-24 14:34:49 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-10-27 08:48:35 +0100 |
| commit | 9ffe904405580fa54f935e2a30fb7b2c9328f9ff (patch) | |
| tree | 393d59d53e208dc6e806cc47acabdf167ceafb64 /net | |
| parent | cfede0d80d785cc6d972cad2df2df0a502312d25 (diff) | |
| download | linux-stable-9ffe904405580fa54f935e2a30fb7b2c9328f9ff.tar.gz linux-stable-9ffe904405580fa54f935e2a30fb7b2c9328f9ff.tar.bz2 linux-stable-9ffe904405580fa54f935e2a30fb7b2c9328f9ff.zip | |
mac80211: minstrel_ht: do not always skip ht rates vht_only is true
When CONFIG_MAC80211_RC_MINSTREL_VHT is set, the module param
minstrel_vht_only tells minstrel_ht whether to allow the mix of ht rates
with vht rates.
ATM, minstrel_ht skips ht rates when minstrel_vht_only is true, but it does
that even if vht is not supported, which makes the sta rates fallback to
legacy as no ht rate gets enabled.
Fixes: 9208247d74bc ("mac80211: minstrel_ht: add basic support for VHT rates <= 3SS@80MHz")
Signed-off-by: Karl Beldan <karl.beldan@rivierawaves.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/rc80211_minstrel_ht.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c index 46666818719b..c50fd94d2aef 100644 --- a/net/mac80211/rc80211_minstrel_ht.c +++ b/net/mac80211/rc80211_minstrel_ht.c @@ -1193,7 +1193,7 @@ minstrel_ht_update_caps(void *priv, struct ieee80211_supported_band *sband, /* HT rate */ if (gflags & IEEE80211_TX_RC_MCS) { #ifdef CONFIG_MAC80211_RC_MINSTREL_VHT - if (minstrel_vht_only) + if (use_vht && minstrel_vht_only) continue; #endif mi->groups[i].supported = mcs->rx_mask[nss - 1]; |