From patchwork Wed Nov 3 15:55:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Li X-Patchwork-Id: 12601087 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87E28C433EF for ; Wed, 3 Nov 2021 15:56:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6CF3960E98 for ; Wed, 3 Nov 2021 15:56:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232487AbhKCP6s (ORCPT ); Wed, 3 Nov 2021 11:58:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49932 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232513AbhKCP6o (ORCPT ); Wed, 3 Nov 2021 11:58:44 -0400 Received: from mail-pg1-x52d.google.com (mail-pg1-x52d.google.com [IPv6:2607:f8b0:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6BDCC061203 for ; Wed, 3 Nov 2021 08:56:07 -0700 (PDT) Received: by mail-pg1-x52d.google.com with SMTP id e65so2754479pgc.5 for ; Wed, 03 Nov 2021 08:56:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=squareup.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fRKGePYlOmiVuBckenaZg2lvZOcrPTPvFy6IKWhuraA=; b=YLEp/Xoz4W2xV+OI2S15NnYwPElTYeS0SpIQ8yv97vYxKejLqOInKtY/oAP/4+D8If YqCq0B7Gm73oeuYX2C0270HXK+PLZp3RO2ZzViWeul/g1R166dSvbJlwbpuzaU+4oEVj K/W6oadXhKmmyRx6f+L4tXrDa22NUqfA9mBAo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fRKGePYlOmiVuBckenaZg2lvZOcrPTPvFy6IKWhuraA=; b=790pBJLPBy5s03vkhqR+K+d9bjn6r3bUq+x8MKRIqom60ZF64bik4d6mbV1SlXCd/l zyk1O5rVMQrwkdtY9T8iSYpp7SYob0x26YR/DbTjmsxf3bnqgeXoVO5l9ZdAM2h+HjfB SFqWk5nxdHjBdVD/+F+LQ7pyAzzgdV1FkbPnIv0M4Q/3dr/0Sv5v9LvbgWfWqXk3MFhe QO3KkidJoF3IWWlXd+O7wQ5uO5i2YDjJLvgvtzv8X5/0k8RJN1PAD4jRQR4m4EnhMY7E p9LYoQvI5JwBGxVkhVs/ctVUWiuMJXMG8qSYBNFGmmw+h2qKNthtTafFma7gS4SqVECU ltWA== X-Gm-Message-State: AOAM531eRRNzr5wWKitrpvIG+B+vgVSfpN8z8eLxVd3Fl7p6cYmuyKl/ nmoEYgpSkCh8+rGykGfnS9TBPQ== X-Google-Smtp-Source: ABdhPJzZXUKnwm5tW5gImvnc6h54z0C6R5vHG6hKRJ120aAOl/5rSmHIVJZ0BQ68n5YA2oGHIXJoSg== X-Received: by 2002:a63:4d20:: with SMTP id a32mr33303288pgb.247.1635954967135; Wed, 03 Nov 2021 08:56:07 -0700 (PDT) Received: from localhost ([2600:6c50:4d00:d401:aa7a:1484:c7d0:ae82]) by smtp.gmail.com with ESMTPSA id h11sm3174517pfc.131.2021.11.03.08.56.05 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 03 Nov 2021 08:56:06 -0700 (PDT) From: Benjamin Li To: Kalle Valo Cc: Bryan O'Donoghue , Loic Poulain , linux-arm-msm@vger.kernel.org, Benjamin Li , "David S. Miller" , Jakub Kicinski , wcn36xx@lists.infradead.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/2] wcn36xx: fix RX BD rate mapping for 5GHz legacy rates Date: Wed, 3 Nov 2021 08:55:42 -0700 Message-Id: <20211103155543.1037604-3-benl@squareup.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211103155543.1037604-1-benl@squareup.com> References: <20211103155543.1037604-1-benl@squareup.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The linear mapping between the BD rate field and the driver's 5GHz legacy rates table (wcn_5ghz_rates) does not only apply for the latter four rates -- it applies to all eight rates. Fixes: 6ea131acea98 ("wcn36xx: Fix warning due to bad rate_idx") Signed-off-by: Benjamin Li --- drivers/net/wireless/ath/wcn36xx/txrx.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/wireless/ath/wcn36xx/txrx.c b/drivers/net/wireless/ath/wcn36xx/txrx.c index f0a9f069a92a9..fce3a6a98f596 100644 --- a/drivers/net/wireless/ath/wcn36xx/txrx.c +++ b/drivers/net/wireless/ath/wcn36xx/txrx.c @@ -272,7 +272,6 @@ int wcn36xx_rx_skb(struct wcn36xx *wcn, struct sk_buff *skb) const struct wcn36xx_rate *rate; struct ieee80211_hdr *hdr; struct wcn36xx_rx_bd *bd; - struct ieee80211_supported_band *sband; u16 fc, sn; /* @@ -350,12 +349,10 @@ int wcn36xx_rx_skb(struct wcn36xx *wcn, struct sk_buff *skb) status.enc_flags = rate->encoding_flags; status.bw = rate->bw; status.rate_idx = rate->mcs_or_legacy_index; - sband = wcn->hw->wiphy->bands[status.band]; status.nss = 1; if (status.band == NL80211_BAND_5GHZ && - status.encoding == RX_ENC_LEGACY && - status.rate_idx >= sband->n_bitrates) { + status.encoding == RX_ENC_LEGACY) { /* no dsss rates in 5Ghz rates table */ status.rate_idx -= 4; }