Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp4755784yba; Mon, 20 May 2019 03:15:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqzhGS4NtrqMdVBTq7vZ+j5BiTVyEbjaTzQ5tvqsvC6mA1PvRiLvlOT9/xdG8hoFmp9nFK/S X-Received: by 2002:a63:b706:: with SMTP id t6mr68653648pgf.305.1558347345228; Mon, 20 May 2019 03:15:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558347345; cv=none; d=google.com; s=arc-20160816; b=X6NrAwBSv8RoewELZLWgD6QfmHeoWDYojrPL0VXq/LxT6A11w9se4Gj5+3sTLaHcF8 hvOuh9v4KJpgZ8IPYKRzPLDM69Qn4FB0MWM4wqZ4FEYf4l0e1fXEC80fAbVQaveQSGf8 vBv9h8lAj0WM3BN220gSUkAbtUZaWAqmLoc+Oq9K5kcJogv8S/pmfRwBsb8O6S2aHq33 RDNytE1FZA+BPCCy9cZZgboS3abKFz+6ysUoLw6GCFv4y7faolQD1fDcz6Q9s86ZhmqM GwAOzZPKztogrjeohczThnAGpU5YwJf0n79JtfSfRE8EQ5fU+fndDqP6Q41M/C7J3jeI 7iWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=2+CGbA9vgw3v0VqiNrKrdiT8GwLBcNjt6YE0Q15jcBM=; b=eUoKjzeLgmaHI08DPFqM5oGymW4t8BcEp81grYMxjVtr2sDAjEcm24SLC+TPx4jA4r 6wJ5x0DC7Ks7jrPf/DUMYbmtk39/oM0v5Oci3MrEP55w34MUDebEux1qk92Wtv8RTIot HEPL8jiQ042M/xpIS+35sOpPbF9yuLnytxIvIcqLgp+3O8fs8LTRhqkeIalbBFX/Lry8 J0Z5SzsDEwpZmwk0fsjGyp9pe/wkJHsgC9lzRUey50Fm7Q2cZyePM6QuT9jStgGmZMcX vz5qrEewutKdX2VMjB/S9t12fxdTvLaHyu1qG7LWw7n7AfwyL47JvEjhaIhjxB6vd8iI Xn0A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v35si17011027plg.136.2019.05.20.03.15.30; Mon, 20 May 2019 03:15:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731685AbfETIz2 (ORCPT + 99 others); Mon, 20 May 2019 04:55:28 -0400 Received: from nbd.name ([46.4.11.11]:41466 "EHLO nbd.name" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731660AbfETIzW (ORCPT ); Mon, 20 May 2019 04:55:22 -0400 Received: from p548c87ba.dip0.t-ipconnect.de ([84.140.135.186] helo=bertha.datto.lan) by ds12 with esmtpa (Exim 4.89) (envelope-from ) id 1hSe4l-0002Y7-31; Mon, 20 May 2019 10:55:19 +0200 From: John Crispin To: Kalle Valo Cc: ath11k@lists.infradead.org, linux-wireless@vger.kernel.org, John Crispin Subject: [PATCH V5 6/8] ath11k: add defines for max MCS rates per phymode Date: Mon, 20 May 2019 10:55:06 +0200 Message-Id: <20190520085508.5888-7-john@phrozen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190520085508.5888-1-john@phrozen.org> References: <20190520085508.5888-1-john@phrozen.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Signed-off-by: John Crispin --- drivers/net/wireless/ath/ath11k/core.h | 4 ++++ drivers/net/wireless/ath/ath11k/dp_rx.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/core.h b/drivers/net/wireless/ath/ath11k/core.h index a7c59ea0c228..d0d960b384e7 100644 --- a/drivers/net/wireless/ath/ath11k/core.h +++ b/drivers/net/wireless/ath/ath11k/core.h @@ -46,6 +46,10 @@ enum wme_ac { WME_NUM_AC }; +#define ATH11K_HT_MCS_MAX 7 +#define ATH11K_VHT_MCS_MAX 9 +#define ATH11K_HE_MCS_MAX 11 + static inline enum wme_ac ath11k_tid_to_ac(u32 tid) { return (((tid == 0) || (tid == 3)) ? WME_AC_BE : diff --git a/drivers/net/wireless/ath/ath11k/dp_rx.c b/drivers/net/wireless/ath/ath11k/dp_rx.c index 62820c20f7c1..e52a54cd2b79 100644 --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c @@ -1705,7 +1705,7 @@ static void ath11k_dp_rx_h_rate(struct ath11k *ar, void *rx_desc, break; case RX_MSDU_START_PKT_TYPE_11N: rx_status->encoding = RX_ENC_HT; - if (rate_mcs > 7) { + if (rate_mcs > ATH11K_HT_MCS_MAX) { ath11k_warn(ar->ab, "Received with invalid mcs in HT mode %d\n", rate_mcs); break; } @@ -1717,7 +1717,7 @@ static void ath11k_dp_rx_h_rate(struct ath11k *ar, void *rx_desc, case RX_MSDU_START_PKT_TYPE_11AC: rx_status->encoding = RX_ENC_VHT; rx_status->rate_idx = rate_mcs; - if (rate_mcs > 9) { + if (rate_mcs > ATH11K_VHT_MCS_MAX) { ath11k_warn(ar->ab, "Received with invalid mcs in VHT mode %d\n", rate_mcs); break; } -- 2.20.1