Return-path: Received: from mail-wg0-f51.google.com ([74.125.82.51]:51957 "EHLO mail-wg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932169Ab3CDW3P (ORCPT ); Mon, 4 Mar 2013 17:29:15 -0500 Received: by mail-wg0-f51.google.com with SMTP id 8so4614628wgl.6 for ; Mon, 04 Mar 2013 14:29:13 -0800 (PST) From: Karl Beldan To: Johannes Berg Cc: linux-wireless , Karl Beldan Subject: [PATCH v3 2/2] mac80211: fix the check for mcs rates masking Date: Mon, 4 Mar 2013 23:28:33 +0100 Message-Id: <1362436113-24775-2-git-send-email-karl.beldan@gmail.com> (sfid-20130304_232929_538829_75466BFA) In-Reply-To: <1362436113-24775-1-git-send-email-karl.beldan@gmail.com> References: <1362436113-24775-1-git-send-email-karl.beldan@gmail.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: From: Karl Beldan 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 driver ht caps, and update the comments accordingly. Signed-off-by: Karl Beldan --- net/mac80211/rate.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c index cedc2ef..94daf34 100644 --- a/net/mac80211/rate.c +++ b/net/mac80211/rate.c @@ -455,13 +455,15 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata, ref->ops->get_rate(ref->priv, ista, priv_sta, txrc); /* - * Try to enforce the rateidx mask the user wanted. skip this if the - * default mask (allow all rates) is used to save some processing for - * the common case. + * Try to enforce the rateidx masks the user wanted. Skip this if mask + * is the default mask (allow all rates) and mcs_mask does not differ + * from the driver ht caps to save some processing for the common case. */ mask = txrc->rate_idx_mask; mcs_mask = txrc->rate_idx_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))) { if (sta) { /* Filter out rates that the STA does not support */ mask &= sta->sta.supp_rates[info->band]; -- 1.7.9.dirty