| Message ID | 1414154089-5185-1-git-send-email-karl.beldan@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Fri, Oct 24, 2014 at 02:34:49PM +0200, Karl Beldan wrote: > From: Karl Beldan <karl.beldan@rivierawaves.com> > > 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> > --- This sneaked in between v4 and v5 when reformatting the code for 80ch. v5: - fix some checkpatch complaints this, leaves 2 false positives "ERROR: Macros with complex values should be enclosed in parenthesis" in array initialization Karl -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 2014-10-24 at 14:34 +0200, Karl Beldan wrote: > From: Karl Beldan <karl.beldan@rivierawaves.com> > > 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. Applied (as is) johannes -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Oct 24, 2014 at 04:30:35PM +0200, Johannes Berg wrote: > On Fri, 2014-10-24 at 14:34 +0200, Karl Beldan wrote: > > From: Karl Beldan <karl.beldan@rivierawaves.com> > > > > 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. > > Applied (as is) > Ok, thanks. Karl -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c index 4666681..c50fd94 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, /* 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];