Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2564492lqp; Mon, 25 Mar 2024 02:46:31 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWuXrtPxoRJxf8DIj7Ho77MBxNn+Ya+K4vbw111EkUWAZw5GBWdr0cdQEc87sDl4/nP3qeVT0xJrImgNx+7wo+slVG9BNHNn0oEuHLc8w== X-Google-Smtp-Source: AGHT+IGMmWCd/zUX48JzO056Hv5Zh1P5Yq7pyOsq+vEQde69o60aFhYj7XVFwurjIL2+D5KlAJid X-Received: by 2002:a05:620a:1b83:b0:78a:4078:6cf2 with SMTP id dv3-20020a05620a1b8300b0078a40786cf2mr10845025qkb.33.1711359990878; Mon, 25 Mar 2024 02:46:30 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711359990; cv=pass; d=google.com; s=arc-20160816; b=0Eljipt7COw4DJlw0KWXTdnpKSI6x/K5RmNpCDvbDOtwHHuxwbpXvmU0zuFYBYLxb0 GqcJ9GagDSkuVj7vz95ziR01JmR+onFoAmNO/k6U7J9iTlIl6P5IA7IXHlD30kUIFSYB IwCoxVwzImzdVmOGAYs8VwCZsz72wdM+Aw6n+59HtobZ3v0G3zZCjuoX7CS6f/bOTvHQ cRfh/bQoqnYoDJmrjEOPg0OOEqNx/orzOVBG36lN1RqRx16M4i6CEleBBtXIwbrhGXtH DTPrkbM9S79K2/pRUd7wXc1r82X5GQlcFLVGV5BFUkblyJK8GfXfAAfIBpw54n/+Ncp8 SqKA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=FmLPwu9p/YpXCwP9KL1W7lXEWZ9DC7e7axuF1uqWMZ0=; fh=RfApuWMrCBQYs6j8reEIHEe4vQngvgoyYVaRxNjhx6g=; b=jt0bCiZmyXnGqXzsBAOCUg0l6Hen4sfcOT5vZ8W7DTm5gfTAqu+U62WvZdqXZVNghQ Olxxwh4JzHhR7cHwfAHJ1PTSl9JrJAkEvoDSGQ89WbWB31Cx0KRqU77Lw3QlJrlyvBQr SqBZrLBb9JNK7ZIn5n5C+1gudvWtiN5PcHnn6oyq30zFdUYdEJ88jgwyLWyOu4j9Ai0c H3bNZiJ0mUzmGuzBRbC5ssYJTVOyIdNcL9t/Y3cWXaNE4Ap6fhqaHQ5J8b90JTb/1sEV d2HITgGtEpnH1JFw0INNdERVUnQ1UkM/Y1ShDJWwiLOM5np73Y7mYY0AC2e8EbLuyikP NqxQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ip+NDEOH; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-115920-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-115920-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id os24-20020a05620a811800b0078a0d51b9e6si4938256qkn.695.2024.03.25.02.46.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 02:46:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-115920-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ip+NDEOH; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-115920-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-115920-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 882EA1C31ED9 for ; Mon, 25 Mar 2024 09:46:30 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DAB9C38B02C; Mon, 25 Mar 2024 03:03:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ip+NDEOH" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 46A631487F9; Sun, 24 Mar 2024 23:15:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711322115; cv=none; b=tOBasQpRa2JeuTIBM8IaQloSwCkEyUi83H1Q5MOmk19zKM4aILsqPV+QJ9jC4InPKB04HbfGKQmiTvmaSPnNODb1xi4WaFgX3NypbR2EAXH6l2p58QB2DAmjG4WZejsHGkBxSWF9+lEMuhxLGmH2eWMtYpaGj2C2c+lpSR5MhA0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711322115; c=relaxed/simple; bh=Nmw5THMc56boYoN+6LILknPlj2jAuIWd5p8Yh2bj8GQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NSpp1+5IcHvfNO5sroQo95G9iDR49LGOrhS3EdtRfiMP3eABsRuPvVPskeeZNeaEs9mq8XrFVYLrUVXPqdpP4NOss/nBHeq1ir70Oa3H58HlZyPPjCaTPCURCQQr897XxkfcZHbrkOUDeZbhOKDxE95vn4jDB90KR8pVsVqSvvg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ip+NDEOH; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6CB2FC433C7; Sun, 24 Mar 2024 23:15:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711322115; bh=Nmw5THMc56boYoN+6LILknPlj2jAuIWd5p8Yh2bj8GQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ip+NDEOHtv8AusZZrboVf+m55llIwpiqpbLBS5XclYn/wDU/YmGW0tcyqJDEN95Z3 edK8i0iPE3LathAWLIPqy+ePZohupAR9UKgFVBSiyxIeaZJIGCPnOXqHVqTidRACIE qUrwZm4PNaRZfmyRZmbhL9wVTRWyhGeBHAN/+nAtufmTOdqpBMxCsQkgzSpy60jErj 5wAYaDIT48U51JgrOel0CZLJvvBP2cxYx02wzuwUobEoPJIPyJa25ePGBrFOBktJZC yBan5Te7LSkZsq92ukfl+IxC/FilFB/ScKwcorzumpUNJzDzbYtm/KEJR663R4G3Ui dNRNliWL6shGQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Bitterblue Smith , Ping-Ke Shih , Kalle Valo , Sasha Levin Subject: [PATCH 6.1 190/451] wifi: rtw88: 8821c: Fix false alarm count Date: Sun, 24 Mar 2024 19:07:46 -0400 Message-ID: <20240324231207.1351418-191-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324231207.1351418-1-sashal@kernel.org> References: <20240324231207.1351418-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Bitterblue Smith [ Upstream commit c238adbc578eeb70cbc8fdd1bef3666b0f585b13 ] total_fa_cnt is supposed to include cck_fa_cnt and ofdm_fa_cnt, not just ofdm_fa_cnt. Fixes: 960361238b86 ("rtw88: 8821c: add false alarm statistics") Signed-off-by: Bitterblue Smith Acked-by: Ping-Ke Shih Signed-off-by: Kalle Valo Link: https://msgid.link/f3cb6d17-e4e4-44a7-9c9b-72aed994b5c9@gmail.com Signed-off-by: Sasha Levin --- drivers/net/wireless/realtek/rtw88/rtw8821c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821c.c b/drivers/net/wireless/realtek/rtw88/rtw8821c.c index 609a2b86330d8..50e3e46f7d8aa 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8821c.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.c @@ -674,9 +674,9 @@ static void rtw8821c_false_alarm_statistics(struct rtw_dev *rtwdev) dm_info->cck_fa_cnt = cck_fa_cnt; dm_info->ofdm_fa_cnt = ofdm_fa_cnt; + dm_info->total_fa_cnt = ofdm_fa_cnt; if (cck_enable) dm_info->total_fa_cnt += cck_fa_cnt; - dm_info->total_fa_cnt = ofdm_fa_cnt; crc32_cnt = rtw_read32(rtwdev, REG_CRC_CCK); dm_info->cck_ok_cnt = FIELD_GET(GENMASK(15, 0), crc32_cnt); -- 2.43.0