소스 검색

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>
Karl Beldan 10 년 전
부모
커밋
9ffe904405
1개의 변경된 파일1개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 1
      net/mac80211/rc80211_minstrel_ht.c

+ 1 - 1
net/mac80211/rc80211_minstrel_ht.c

@@ -1193,7 +1193,7 @@ minstrel_ht_update_caps(void *priv, struct ieee80211_supported_band *sband,
 		/* HT rate */
 		/* HT rate */
 		if (gflags & IEEE80211_TX_RC_MCS) {
 		if (gflags & IEEE80211_TX_RC_MCS) {
 #ifdef CONFIG_MAC80211_RC_MINSTREL_VHT
 #ifdef CONFIG_MAC80211_RC_MINSTREL_VHT
-			if (minstrel_vht_only)
+			if (use_vht && minstrel_vht_only)
 				continue;
 				continue;
 #endif
 #endif
 			mi->groups[i].supported = mcs->rx_mask[nss - 1];
 			mi->groups[i].supported = mcs->rx_mask[nss - 1];