Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp4569813pxv; Tue, 6 Jul 2021 04:18:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyAmRpaNWfv/uEz0J6cxPQ+j9RbeQe5P888dzqPimrVjkw306KN8OnQXN1tC1K7un+1gI5n X-Received: by 2002:a05:6e02:2163:: with SMTP id s3mr13542093ilv.3.1625570294017; Tue, 06 Jul 2021 04:18:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625570294; cv=none; d=google.com; s=arc-20160816; b=dFrCONg55xe0ea0hAlFX7UqgP19WykhuSIz/VmwDSIussUvrvJXL3jtfX3agRbqH8Z rd7upuCubyiw+7/P860M9mXELtUWx4MxHbKp+O2cdke4yB6Q+oNBi4mSylrlj1oI/af2 nAS1g5dw1km2e8rRWo01jwQhBkjWqGCwOpWM2odhUg25yBty8Neb6yWtRPBZ6RrmLVNs 4DOXzr5maHxPC+W8IQUckg/QLsVHcWUHUyUGUqgue151ATHcQm+WsICtNIGEhwKdncWq iTW0u9zYs+ocpfIZs0fxDN1VHvXsupGYg7eo7+wsP1BiDm9t4olOm+/AeiqSbVeyHcMa LLMQ== 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=yjiZKVVvCBbMklqvsf+FyJ4DvkU7j3cARser2zEtYFg=; b=tpTLGfbnUISe09XNzPAMCABNeYkvEzljZ4s457u1UR7lG+T8g+k7zU3OLVgkg3PunM DQD2o/9PA6OUcHiF9zzuQ0kK22cCvEMpybK4O4zZ0Bg0FGe+MqSmQXHGHt8UarKMkLUI vWIKxxR23bCE3v5+5go/DTj5M05zfVzIu4YJOAB42DFmPnlhEueHbMiPGawz25qb/d5g +STFyop2PWnqBMcIWb/rwTMYPL68m/xnfcNEmOCTM1NKhQs173Rc1kw4PtWo1Fcu+cI3 aNXtaZML9nA+uLOjiQ9zWvIFp2UEcc7/kQauDsJaZ9XdaRySDLcf+UE2SuBXP+U0X72x 1LdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=NqfXRtuh; 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 n6si18410752ilj.66.2021.07.06.04.18.00; Tue, 06 Jul 2021 04:18:14 -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=NqfXRtuh; 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 S233303AbhGFLUf (ORCPT + 99 others); Tue, 6 Jul 2021 07:20:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:55152 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232798AbhGFLTc (ORCPT ); Tue, 6 Jul 2021 07:19:32 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B2D0461C68; Tue, 6 Jul 2021 11:16:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625570213; bh=AKtqmWb7vFI//+JilmD8Bm/E9ymQ2BAK75tyjhpYvwg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NqfXRtuhI6cPToP83A2qn8MmeRsc+bvdc8pveAG0AQbMqSXdBBtuk8i27a3swEder /PGImoFS9SSHcYELBuKjHKUFuaSIXl0PKXvXVqVW9a7mBIa876DQzj+yIhCV9mjD2q K124lXh58eR2h7D6L480JG20iE0NGRo8+vgRse7qU0FlikiVmmhpNICG5Pie+w4iQZ TVO2Y4qadOVBCI1Wb77IgdMCffI51xASE9HjVmfvBYvy/XWEsYVbR1hoJZMJfFJWv8 T7Gl5XfDX/7Kjbzton7WiDl9qd/VNmbddbiwtCUsTNQ3oIQjhlGE1oKzxMo6KekVL1 R2twqASBwyhUw== 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.13 122/189] mt76: mt7615: fix fixed-rate tx status reporting Date: Tue, 6 Jul 2021 07:13:02 -0400 Message-Id: <20210706111409.2058071-122-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210706111409.2058071-1-sashal@kernel.org> References: <20210706111409.2058071-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 e2dcfee6be81..7bdf3378a4d1 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c @@ -1235,22 +1235,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; @@ -1272,7 +1270,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