Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp639836pxb; Tue, 5 Apr 2022 16:57:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxUCqvBTlHR/fGqEX09yXe57rjoaxYr9NS37lQdo2hj3hqubIa7ytn4vF7T2+k22EfC4ChB X-Received: by 2002:a17:902:ab46:b0:156:8128:189e with SMTP id ij6-20020a170902ab4600b001568128189emr5879764plb.85.1649203041054; Tue, 05 Apr 2022 16:57:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649203041; cv=none; d=google.com; s=arc-20160816; b=NefRqtztPYt/xSCWfP0otGG7rpWNwdIaMUjGrU1mWwXiVzErpav1NTWQiH5ViYT7wu Fgs2jGW1n/Uv/li48fQawSwfrUPyQhg8fN+763VavD9q9mJyWojB8UaKKQ0UJ33iu8tR R5aORZ63nuzwIpbBm4Po0Js5GZJclc/A+JlxCQt17sso0Bi6qcFqntCrlo7sEFyS/gxx TWlkZN/7d2EknyMuZhh373eJPNxvn5n+bYlKictv8d5nJ2HjdB1SAFsoJSl/zUUgalWr 8P/NUvvMsw+VhbUDaT+TgeNEw9YDnKOSOtzRjWBvi6pwDuyASH/JqfJObOIvKQGSgntf o2wg== 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=ZxK3OJ8L8LQaqDOgJDBSU5lDRGJsCVk2uDDB4XWGrRU=; b=rHRG290zbK9AVo89Lv+tFrl9Q43hIH5RsjVyWmS1g32ySFw7DPQSo1e5uGcLaJefz3 WE/kAv0BH3nEMFyEq5gLHPmtsRSWkDvZ7e6GBaY7CsZGqs6SeL28d8Vt+/WQF2EzEv1t tGzFNOQFXFvfOI+6HMFTJiWh5acItlt5zEyANkUsAfDnhis/7PYQsr3gupdrFhE04sGo 0eGHquVdEvMMHmOrzTI7Ayp7il1J4Jp7dxf/FGrlKKHvR+NF7gNZwUzyQo3ona7d7aqk lepYYNysHT7ZdQMeSBbOwwdKfmRUHPGDam7DNd2rtFzJAFJW6euox0KL2UZVAKZ89MJu HTHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=o5UHpi0n; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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 lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id y20-20020a1709029b9400b00153b2d16545si13324803plp.333.2022.04.05.16.57.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Apr 2022 16:57:21 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=o5UHpi0n; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 6D3DC280C37; Tue, 5 Apr 2022 16:43:12 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1384727AbiDEM15 (ORCPT + 99 others); Tue, 5 Apr 2022 08:27:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58506 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245290AbiDEIyj (ORCPT ); Tue, 5 Apr 2022 04:54:39 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 123C1101FE; Tue, 5 Apr 2022 01:52:12 -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 sin.source.kernel.org (Postfix) with ESMTPS id 50874CE1C0D; Tue, 5 Apr 2022 08:52:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 68BDCC385A1; Tue, 5 Apr 2022 08:52:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649148728; bh=I3n0aTUlW02rmt47gc2lAImmuuLyCn8dtNHfOnE+H2U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o5UHpi0nF16vHOFZAS6m+d9hOvdb4Mum+hQV56uoFQNZuVDbktLRt64AEF8ilosyd pf3HQL5vcCgYbsypaWgQ9UiirkB2W5qkaCrN5IJ16lzOh6XvCsMJu0oRxXtFaKFy8I WWjYnyasMFQ6b2ID5MAQ7b1WUR5cTIrUoZYxzMOM= 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 0459/1017] mt76: mt7915: fix ht mcs in mt7915_mac_add_txs_skb() Date: Tue, 5 Apr 2022 09:22:52 +0200 Message-Id: <20220405070407.923561100@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=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no 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 38d66411444a..a1da514ca256 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c @@ -1412,7 +1412,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