aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKarl Beldan <karl.beldan@rivierawaves.com>2014-10-24 08:34:49 -0400
committerJohannes Berg <johannes.berg@intel.com>2014-10-27 03:48:35 -0400
commit9ffe904405580fa54f935e2a30fb7b2c9328f9ff (patch)
tree393d59d53e208dc6e806cc47acabdf167ceafb64 /net
parentcfede0d80d785cc6d972cad2df2df0a502312d25 (diff)
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.c2
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,
1193 /* HT rate */ 1193 /* HT rate */
1194 if (gflags & IEEE80211_TX_RC_MCS) { 1194 if (gflags & IEEE80211_TX_RC_MCS) {
1195#ifdef CONFIG_MAC80211_RC_MINSTREL_VHT 1195#ifdef CONFIG_MAC80211_RC_MINSTREL_VHT
1196 if (minstrel_vht_only) 1196 if (use_vht && minstrel_vht_only)
1197 continue; 1197 continue;
1198#endif 1198#endif
1199 mi->groups[i].supported = mcs->rx_mask[nss - 1]; 1199 mi->groups[i].supported = mcs->rx_mask[nss - 1];