Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp690485pxb; Tue, 5 Apr 2022 18:56:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxKg7Pb82m57K9898KFCdRLh9hsYG9FkF1kQbGbLBkHh8qofysBatiN8elU7vWGIHthHbpJ X-Received: by 2002:aa7:cac8:0:b0:410:cc6c:6512 with SMTP id l8-20020aa7cac8000000b00410cc6c6512mr6319500edt.408.1649210194298; Tue, 05 Apr 2022 18:56:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649210194; cv=none; d=google.com; s=arc-20160816; b=gmDb6Tpni8lnPeAQ3FE5+aCm/cPKvqnLuFad/2DdS2UreGwLpwkPz1N1wXudfft69Q j5QPcNDLSWC4ec+4aAKAAh/Wx3BkqUND2lUV7QoBH4HAJTUqMwicKr6mqggmVQvKTWWK NuDhTTStFHQuOkakl+jxdZFinPpZOs9F5B2U5rr01PoFhpOSEW5DrkFLL1MIfR8FnMMA zXolItaamdE4YqsudcIoJlfsBiVL6ek+rNayl8aIiySTBc8KvDUXgHtwQ5qd7yVPZOWS n0T9eqomJefv9W/1o8pFd/EyzeUKV6rwdJ/I8df6ziyjSu3JMYbOuup/0eEKh3BuO3Xq PQ4A== 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=SwwPwTppGdG6aFze0ja25A/MXJ8EPAAD7Mh60IIF/jI=; b=BcVGM5z+7NrZY8kENdWZEcevsRCOCJNjfzvSoMKEEq/x24DNj7DTjY7stBzbuAq2DW Ip8tGrjeXim5S70NgiaMei3Xun2Jgkk1hjxcNWJ/njYWqD0ky2nWxsZEtmNLo+ByQItj EH6RtMMsiDxd2AFMxIwS5GIT2Cblzs7wYd1EExpqLL+JcN7Zbpt057SkInJ4u89znPQD ehawh+Du93GEZlEUO6dhYcUG5Hut3yQ+lrEwD9WFEpXwjB4ZN3cDnvNmy0AvpjE/Lkul qk7T4KE5xAEoEl7bBnsJurhjaGJhuagSSw0AbC9JJKZGonv9shlqMbABtoyepPokglZu meCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=LZNFzNg9; 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 k27-20020a1709063e1b00b006dfd46f60edsi10120045eji.311.2022.04.05.18.56.07; Tue, 05 Apr 2022 18:56:34 -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=LZNFzNg9; 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 S245472AbiDEI4B (ORCPT + 99 others); Tue, 5 Apr 2022 04:56:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233231AbiDEIGp (ORCPT ); Tue, 5 Apr 2022 04:06:45 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5C91569CC5; Tue, 5 Apr 2022 01:01:52 -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 BF933B81B14; Tue, 5 Apr 2022 08:01:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1F5E7C385A1; Tue, 5 Apr 2022 08:01:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649145709; bh=3B7rci6vm+gxEqP43CLYfU7pk9MUF4tG0H80bTJNQXE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LZNFzNg9z8Tqahft92VsTcbfqy348121AtWQQm+vyfum1YDaz30NynnETvAm3p1p2 Oxtljf3OyEYpRbhZ19vGW/B41kKVxzJlDE4PqryWiL5i4DncyJEdpjF01cniDhlwOG xht4EX6tXzISb3DDXYlP1jpAXe7YF//fMxPihXag= 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.17 0500/1126] mt76: mt7915: fix ht mcs in mt7915_mac_add_txs_skb() Date: Tue, 5 Apr 2022 09:20:47 +0200 Message-Id: <20220405070422.303076267@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405070407.513532867@linuxfoundation.org> References: <20220405070407.513532867@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 d8e4e8d148fb68858d6a997d88a87a2c615629ce ] The mcs value of HT mode reported by mt7915_mac_add_txs_skb() has already been converted to the expected format. Fixes: 9908d98ae72cd ("mt76: mt7915: 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/mt7915/mac.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c index 48f115502282..d18a2e93cff5 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c @@ -1512,7 +1512,6 @@ mt7915_mac_add_txs_skb(struct mt7915_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