From: Karl Beldan <karl.beldan@xxxxxxxxxxxxxxxx> For v2: - In case vht is supported but CONFIG_MAC80211_RC_MINSTREL_VHT is not set or the sta vht tx map has no rate supported (not sure the latter can happen) set vht_only to 0 to not fallback to legacy. Signed-off-by: Karl Beldan <karl.beldan@xxxxxxxxxxxxxxxx> --- net/mac80211/rc80211_minstrel_ht.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c index a1f3f75..88c932e 100644 --- a/net/mac80211/rc80211_minstrel_ht.c +++ b/net/mac80211/rc80211_minstrel_ht.c @@ -985,7 +985,13 @@ minstrel_ht_update_caps(void *priv, struct ieee80211_supported_band *sband, BUILD_BUG_ON(ARRAY_SIZE(minstrel_mcs_groups) != MINSTREL_GROUPS_NB); /* For the moment be less verbose and disable ht rates for a vht sta */ - vht_only = vht_cap->vht_supported; +#ifdef CONFIG_MAC80211_RC_MINSTREL_VHT + if (vht_cap->vht_supported) + vht_only = vht_cap->vht_mcs.tx_mcs_map != cpu_to_le16(~0); + else +#endif + vht_only = 0; + msp->is_ht = true; memset(mi, 0, sizeof(*mi)); -- 1.8.2 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
