From: Karl Beldan <karl.beldan@xxxxxxxxxxxxxxxx>
Currently the mcs bitrates mask rate_idx_mcs_mask is only applied when
the pre-ht bitrates mask rate_idx_mask of the same band differs from the
default mask.
Fix it by comparing the rate_idx_mcs_mask with the ht_cap.mcs.rx_mask, the
copy of the rate_idx_mcs_mask is now done if the check succeeds.
This results, when no pre-ht bitrates is disabled && an mcs idx is, to
one more memcmp, otherwise the cost remains identical.
Signed-off-by: Karl Beldan <karl.beldan@xxxxxxxxxxxxxxxx>
---
net/mac80211/rate.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
index cfbd7d5..4c0a14d 100644
--- a/net/mac80211/rate.c
+++ b/net/mac80211/rate.c
@@ -460,8 +460,11 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata,
* the common case.
*/
mask = txrc->rate_idx_mask;
- memcpy(mcs_mask, txrc->rate_idx_mcs_mask, sizeof(mcs_mask));
- if (mask != (1 << txrc->sband->n_bitrates) - 1) {
+ if (mask != (1 << txrc->sband->n_bitrates) - 1 ||
+ memcmp(txrc->sband->ht_cap.mcs.rx_mask, txrc->rate_idx_mcs_mask,
+ sizeof(txrc->rate_idx_mcs_mask))) {
+ memcpy(mcs_mask, txrc->rate_idx_mcs_mask, sizeof(mcs_mask));
+
if (sta) {
/* Filter out rates that the STA does not support */
mask &= sta->sta.supp_rates[info->band];
--
1.7.10.GIT
--
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
