Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp685538pxb; Tue, 5 Apr 2022 18:44:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyt7/5VS/P8MRkh5LMEDrb3OJyOByqiMqJBJHs2iCGM27B0W+4dsojreQ+nHj+GD+6YN+9j X-Received: by 2002:a05:6a00:4293:b0:4fa:e005:7e99 with SMTP id bx19-20020a056a00429300b004fae0057e99mr6468041pfb.20.1649209374803; Tue, 05 Apr 2022 18:42:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649209374; cv=none; d=google.com; s=arc-20160816; b=K+KKLSZCm2CnYdbdCSJJU87q36gQjNuMaph0cNQKVazeKZ6oC9wB27hUFrd/83DtmU DP/xDOq7oYYAWcQySV9rk/uNB10hSDMwDbHzevqd5dxj2BoO4JuTVAFgIt4qZ2lBldB1 jeb/nbsKxFdpNTpUy+JwqsciW08rZgXRTr0u0El5fPbRopaU03dS2OmPDQUXeOd0QKO8 m2qNBC4eaIgbof91Goz8yPk3IoxpYXcqNQm/81ZpLnKsLY0DHnL2S5BPb2GeO4f4oJNL kv14QDUVmD2nTnk11yiO9gG+zGLeJUFiuffYkEruBCA6WELrGh4HjLexEOijBVvQKbvD pykg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=iM7qx1S3z9s8xFkQWS3OIDN0+TFSy/aMrIJBPpJxAGA=; b=Ur2AEj0+eOqK1TfWQd3Vygc1cW/FFcxBZAH0FxXoxJmwYPr3bwpjGOHCxBPg1DO9GE 8WDpGdGVMFLFLyuZszPMU2ZwMrLyKtRedwf96+OF77vuGtldzo72OHFqM3H+sHFqx9GD PihXr2v1PT9vY5I+oAPoIaEQ0HMv4KstmXzH4O+Kd967D3/f1gKMf73WLPdilbY5aujL OXnSFwIBVzvlqyiH+ACniARtQ+b/MUAVLuFVdBsKEtjHOpm6Bmm5RUy2AdPUDb8PAUW4 06i8KpSLV/M1iz75LWTT5D19V9YBts5TQhIwUvTcvHbbTVRCDNE8llcuxQbVFTIkiqRH 3/yw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="AV/87Cie"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w4-20020a170902904400b00156a18597easi7700335plz.452.2022.04.05.18.42.38; Tue, 05 Apr 2022 18:42:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="AV/87Cie"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1384679AbiDEM1x (ORCPT + 99 others); Tue, 5 Apr 2022 08:27:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245309AbiDEIyw (ORCPT ); Tue, 5 Apr 2022 04:54:52 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 981B611C06; Tue, 5 Apr 2022 01:52:14 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 04E2CB81B92; Tue, 5 Apr 2022 08:52:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 479E3C385A0; Tue, 5 Apr 2022 08:52:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649148731; bh=qC1ooVuHBiI+yeqhchXfLHOeM0o/PVJKF8Q1mWFZNUc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AV/87CieYww/Sc2HaGSs1sh7w0kBPL/LmFvvsQXLCSBZwMuSGFEhfszWi1gtdWxPu 8c2jxx0mKliA+4TC8kgIfB/ETh/Ef+j5OSGjDnWGvSJSmlOGDYa2aEbtxLKoR7Sxdh qZwlaQz4/thihL/q7M4H5TmfCx+Co0cZxEmpUEv8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peter Chiu , Felix Fietkau , Sasha Levin Subject: [PATCH 5.16 0460/1017] mt76: mt7921: fix ht mcs in mt7921_mac_add_txs_skb() Date: Tue, 5 Apr 2022 09:22:53 +0200 Message-Id: <20220405070407.953186407@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405070354.155796697@linuxfoundation.org> References: <20220405070354.155796697@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Peter Chiu [ Upstream commit b1fe07ed21024f64719315ba0f3a5676d8b36db6 ] The mcs value of HT mode reported by mt7921_mac_add_txs_skb() has already been converted to the expected format. Fixes: 970ab80ef9f63 ("mt76: mt7921: report tx rate directly from tx status") Signed-off-by: Peter Chiu Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c index 1fea9266d4b8..ea5ae0fc8f54 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c @@ -1014,7 +1014,6 @@ mt7921_mac_add_txs_skb(struct mt7921_dev *dev, struct mt76_wcid *wcid, int pid, break; case MT_PHY_TYPE_HT: case MT_PHY_TYPE_HT_GF: - rate.mcs += (rate.nss - 1) * 8; if (rate.mcs > 31) goto out; -- 2.34.1