diff mbox

squash! mac80211: minstrel_ht: add basic support for VHT rates <= 80MHz

Message ID 1384348652-11738-1-git-send-email-karl.beldan@gmail.com (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Karl Beldan Nov. 13, 2013, 1:17 p.m. UTC 
From: Karl Beldan <karl.beldan@rivierawaves.com>

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@rivierawaves.com>
---
 net/mac80211/rc80211_minstrel_ht.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
diff mbox

Patch

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));