From patchwork Mon Aug 2 15:16:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 490571 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 49531C4338F for ; Mon, 2 Aug 2021 15:17:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 301F960FD8 for ; Mon, 2 Aug 2021 15:17:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235066AbhHBPRJ (ORCPT ); Mon, 2 Aug 2021 11:17:09 -0400 Received: from dispatch1-us1.ppe-hosted.com ([148.163.129.52]:47130 "EHLO dispatch1-us1.ppe-hosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234835AbhHBPRI (ORCPT ); Mon, 2 Aug 2021 11:17:08 -0400 X-Virus-Scanned: Proofpoint Essentials engine Received: from mx1-us1.ppe-hosted.com (unknown [10.7.67.124]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 0A97E1C007C for ; Mon, 2 Aug 2021 15:16:58 +0000 (UTC) Received: from mail3.candelatech.com (mail2.candelatech.com [208.74.158.173]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id DCD5B940027 for ; Mon, 2 Aug 2021 15:16:57 +0000 (UTC) Received: from ben-dt4.candelatech.com (50-251-239-81-static.hfc.comcastbusiness.net [50.251.239.81]) by mail3.candelatech.com (Postfix) with ESMTP id 16DDE13C2BC; Mon, 2 Aug 2021 08:16:55 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 mail3.candelatech.com 16DDE13C2BC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=candelatech.com; s=default; t=1627917415; bh=2Es1FyVE3jgX+6477awy6BaMUBBUCRXlgW8KqeWJyjg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kByS/yrN8Nrsjgl7dd0UPeZK6wLqfSZtS242C5hO+Z1ym71rHyx8CONZsZKcatPz4 QtOwcQFM0GDpipaPoAzQRG63MdB4oGQw8lPVJmpQqaSfWsVGpNDZ5Er3if85U4g5M+ HlFX/mGnNsybH9E5dBHaGAdTclIRPQfFRHY6y65w= From: greearb@candelatech.com To: linux-wireless@vger.kernel.org Cc: Ben Greear Subject: [PATCH v4 08/11] mt76: mt7915: fix SGI reporting when using tx-overrides Date: Mon, 2 Aug 2021 08:16:40 -0700 Message-Id: <20210802151643.32394-8-greearb@candelatech.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210802151643.32394-1-greearb@candelatech.com> References: <20210802151643.32394-1-greearb@candelatech.com> MIME-Version: 1.0 X-MDID: 1627917418-aycyxJasiWhg Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ben Greear The station wtbl logic to read rate-ctrl settings does not work when fixed rates are used. So, read sgi settings from the txo configuration in this case. Signed-off-by: Ben Greear --- drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c index 01f4aa7a6e88..6dd86dbe3e08 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c @@ -176,6 +176,15 @@ static void mt7915_mac_sta_poll(struct mt7915_dev *dev) rx_cur); } + /* If we are in tx-override mode, then wtbl doesn't provide useful report + * for the SGI/LGI stuff, so just get it from the override struct. + */ + if (msta->test.txo_active) { + msta->wcid.rate_he_gi = msta->test.tx_rate_sgi; + msta->wcid.rate_short_gi = msta->test.tx_rate_sgi; + continue; + } + /* * We don't support reading GI info from txs packets. * For accurate tx status reporting and AQL improvement,