Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp4578798pxv; Tue, 6 Jul 2021 04:31:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyPrOjXL/5KOv57ajAZTdG/IZTSHGkPjYpqU9zaIuuWHD2TlahgK8P+6Qie0HjcABnahNtn X-Received: by 2002:a5d:9f4b:: with SMTP id u11mr14837249iot.144.1625571090537; Tue, 06 Jul 2021 04:31:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625571090; cv=none; d=google.com; s=arc-20160816; b=BXNHoZrdeJbc9S2OprTgdf64o9AlKZ3SBhrn0OjAPOxHCtMINVIotIrSW5RS7alXAo rC2vT5crylMmaqvZnI/NK+6y+19GzqYQsRyeqT5vG4HIZje4Z1otyxCAkfqgQBPcfOhz kTaEbQmYM/WyDgBZzcMk3T575Ob4hZudTiy6wAPiFfnvvNbzTHbdDXLyVkDFk1axurpW r36fdnErjUorlp+UGdnLLEhRFoBSctN1Y7/0q/EtncW1ywh8+XYNcjzfl+bnbe55NuEv vDrj/ZJSKhO4M9BmCXh/m0eYXizR4dqehs5rA7cnWx005CWqyCY/NTdx/jm+FJM07lTt wkCQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=GFhekMYp1mqFqdfq0hqqGDZtG/E4s0DMH/l9M6j7fuo=; b=YeA3cCvjWDfO3Otw/rN8vrX/alqpng9AJLmC11AOgx4Pr6PLTPz3Uwc0yBKqd1uwgX IePg0BggePawNT0u7TQDPv2ZcSZ7qY31vk6kCp0PgGmxc8xekoS4P/oD3LRuXphpdjNA WyUVK/dIUTIHI8kq+dW/yHr5kC7/XaFpNUdjvTpksSo9RnWYlk5ZPMNyCgGmZv+1frHG OAtaDN5NArl4QA2TVB0k/GqoMoScz5I2n9+d711mSY3eNNFH0gbZivOruS9ZfOLMeEio ZcScLKU8wgyuF3/+aIlmtJnGOztHp8ML1T0YHLoUAh4e4xdMvg/wzDm0H/b3DtZpRuWR CVqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rwLM+VYW; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l7si19651442iow.4.2021.07.06.04.31.16; Tue, 06 Jul 2021 04:31:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rwLM+VYW; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234847AbhGFLdo (ORCPT + 99 others); Tue, 6 Jul 2021 07:33:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:42496 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235197AbhGFL3o (ORCPT ); Tue, 6 Jul 2021 07:29:44 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id F0AF561D74; Tue, 6 Jul 2021 11:20:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625570441; bh=RPRNZmvuVCB5xcnAbD+p7zyjY3mC4jznPrHztNSsvbg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rwLM+VYWcfX66hlLYujZLzI55HgE16ltHHg7soUqI+AmQZTJRqJsgm7wu3E3KKWKa IJTwdFOFv4Z4o5Cj9cfn/mUgastRW0lIvqsVoCTVUYzQ0NRuVtnwtR4gRrmT2SZ9OB 6p8/5oTTnUoCFpt/wuWEJ3D06e1zVbPBknYzMjsmsSetZe17rho76IAzrLI2Us7tSk sJb02XweYrNoqHKxKzwQ6teDaeByfR+PwlNbmXJaaKyxQRGz8y8CZIjMMQFZSUm9hu Iih/rpAGmaH3Up9WZPE3HioEq+pnHmRVraiBSQ4Jzc21ZxMAIRPo0LAiPjTlCZHOiG pFZ7xzZ0zVZzA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Felix Fietkau , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH AUTOSEL 5.12 101/160] mt76: mt7615: fix fixed-rate tx status reporting Date: Tue, 6 Jul 2021 07:17:27 -0400 Message-Id: <20210706111827.2060499-101-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210706111827.2060499-1-sashal@kernel.org> References: <20210706111827.2060499-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Felix Fietkau [ Upstream commit ec8f1a90d006f7cedcf86ef19fd034a406a213d6 ] Rely on the txs fixed-rate bit instead of info->control.rates Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c index 8dccb589b756..5a63869193f2 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c @@ -1194,22 +1194,20 @@ static bool mt7615_fill_txs(struct mt7615_dev *dev, struct mt7615_sta *sta, int first_idx = 0, last_idx; int i, idx, count; bool fixed_rate, ack_timeout; - bool probe, ampdu, cck = false; + bool ampdu, cck = false; bool rs_idx; u32 rate_set_tsf; u32 final_rate, final_rate_flags, final_nss, txs; - fixed_rate = info->status.rates[0].count; - probe = !!(info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE); - txs = le32_to_cpu(txs_data[1]); - ampdu = !fixed_rate && (txs & MT_TXS1_AMPDU); + ampdu = txs & MT_TXS1_AMPDU; txs = le32_to_cpu(txs_data[3]); count = FIELD_GET(MT_TXS3_TX_COUNT, txs); last_idx = FIELD_GET(MT_TXS3_LAST_TX_RATE, txs); txs = le32_to_cpu(txs_data[0]); + fixed_rate = txs & MT_TXS0_FIXED_RATE; final_rate = FIELD_GET(MT_TXS0_TX_RATE, txs); ack_timeout = txs & MT_TXS0_ACK_TIMEOUT; @@ -1231,7 +1229,7 @@ static bool mt7615_fill_txs(struct mt7615_dev *dev, struct mt7615_sta *sta, first_idx = max_t(int, 0, last_idx - (count - 1) / MT7615_RATE_RETRY); - if (fixed_rate && !probe) { + if (fixed_rate) { info->status.rates[0].count = count; i = 0; goto out; -- 2.30.2