Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ffe9044 authored by Karl Beldan's avatar Karl Beldan Committed by Johannes Berg
Browse files

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: 9208247d ("mac80211: minstrel_ht: add basic support for VHT rates <= 3SS@80MHz")
Signed-off-by: default avatarKarl Beldan <karl.beldan@rivierawaves.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent cfede0d8

net/mac80211/rc80211_minstrel_ht.c

+1 −1
Original line number Diff line number Diff line
@@ -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];