Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2582994lqp; Mon, 25 Mar 2024 03:30:39 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCVqu1HjDKoKUEn58LpoXnHoyOxbi4WswL4EFW/O0Gg2VCxWD1ZNHuSoGRjLoUlvdIS52tESN1XD7r7O1GZUBthc1uGaCtEvhdMfh6WI7Q== X-Google-Smtp-Source: AGHT+IGrb1o7R4Bh1uvZx6kyS44FSLJ+ngICP8udbUEmi+7sRE6OO6S6WhJvOpwlE95++KiCHUfj X-Received: by 2002:a05:6a00:2287:b0:6e7:11f:1d5 with SMTP id f7-20020a056a00228700b006e7011f01d5mr7431176pfe.15.1711362639486; Mon, 25 Mar 2024 03:30:39 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711362639; cv=pass; d=google.com; s=arc-20160816; b=s9b56OSEG44dmM4qYw5PM5A8Fh0DuMlQ884o7RGKYR6MwYWxHJV6vYi31Wz0YuXCP5 9VQ4G4+fyB4AKAUnBOpy4dHr03hMVcA2RtjC7hX1FNjUAjJWVFrk/BM+BZGn8FKvJAM/ zlzvFbXL3JRHmvr4LJUByaHBYd3D10QRRaZtD1Q464cd79vmrrTyXqQuZbKM8c6tERvj gFSPp2x2ETnzD29RYuR+pUhlnXCg12SvS/8woKQu3Lao+wbrYpGyuxEeKFgRyv7pzv2k lc/rmL18J8tQ08cEtrXE3N96resaxTxRIqDjMZEviKb/1nW/e+b3Cd6psMEGlRSesfI2 A/1Q== 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=E4VEu/uawjBJ1tzIIewDdSSDjCnoHFcHNiCr8dtcfG0=; fh=RfApuWMrCBQYs6j8reEIHEe4vQngvgoyYVaRxNjhx6g=; b=YtkQ9SRXDJyWO3x/QMCY0QHiZVwAXpQycbn1fN7MrnvqW2Ga6TTukO1nCD31ivA0/J Nruhr1aMbcAo4xn0dk2b639PCvQJswiDvjSvZfmCntmp65CWRvt42eQ/1SiOWWtWAwNQ UlBIdICzDwBo5z20as0VizXXc+1ujdevr6xrjqnDUnCdtWla7BGafDoBrp0NYM54EDLg XvJkH+7NAmswuqhRWg7N0UYndKpm80OL+/GlUEcONRoYopW7Qqjt9qsXcwkLZ5WMA/P5 zXbEXf86szRjgAOsbwxO81H2LF7V+ZOr7GjUMax3ixRQXcDLcRuEw8X7DLK7bWfGMlsG MITA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="Aq/j67c7"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-116150-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-116150-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id f19-20020a056a0022d300b006eaae364749si1307133pfj.182.2024.03.25.03.30.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 03:30:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-116150-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="Aq/j67c7"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-116150-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-116150-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id E6FF729C302 for ; Mon, 25 Mar 2024 10:15:57 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D3B3D3B1E2A; Mon, 25 Mar 2024 03:32:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Aq/j67c7" 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 0141F1311B3; Sun, 24 Mar 2024 23:41:47 +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=1711323708; cv=none; b=KNROiAcNc6z2AlUd++bjgQRdtV0w3Hr/uFOnNb2SYtxlVSVyoozYQwLsy2TLOlh/gZ/0nu7Qmie15SNSmKBm9kQ/TzcRgGMTu6ONHxtVRhsr0Xi5Lbp1kmSOm5dCjjlN0FdGaYnseJwX04aGe1QkJeSLibrcb/VMoPCvifZY4BM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711323708; c=relaxed/simple; bh=xfzY6sqSCTfLmXyPr1h7wJ82kutCf6cup+CAcJxnjPQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nH+y4hCavTeo6821twcIuMSUXDW5iBU21Wq6D+US5hINkGBLkoRoNWHmsTvb/IQMstkKrDukseAdNE6Qr/EMy04YHtQf9eJwzkgxcqGGp0QAHDQUN+Z6tGdww9WzAjx+EPQJPxyL/rOCuiF7rfKRHdMqhJNtObZ1tJdZWQsAUs0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Aq/j67c7; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 18A8FC433C7; Sun, 24 Mar 2024 23:41:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711323707; bh=xfzY6sqSCTfLmXyPr1h7wJ82kutCf6cup+CAcJxnjPQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Aq/j67c7LEKyl844fWuC9Ey4vw2mmYCB++Lepkm3o/9lWeqWebQIGT8bLvI0EF4jo lTHAWzxynPUuUIBSLr1TeJfNxxUOBM6N9sPus/WDX7ibBhF5iLx4fOnsFWubWArjmt ElGacaHgqYI6sk4kcwv2UH91tGotfaiwMtTElyUxc0naHhtDHiLfaVIgK+MTMAE70s E/LiN0OIsxyvd3SCK9k7NUAP2En6eSgdhSM9EB6yUzUZUULX4CUiwd2XTOdirZtjfR OUtgxo0nPs3hiu8CKBFL8NlDdp/P8Q06B0V7M6KXgq/uuA7ZAfomysxA6PcQvuS2mZ pTFPVOlSNmKag== 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 5.10 081/238] wifi: rtw88: 8821c: Fix false alarm count Date: Sun, 24 Mar 2024 19:37:49 -0400 Message-ID: <20240324234027.1354210-82-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324234027.1354210-1-sashal@kernel.org> References: <20240324234027.1354210-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 f9615f76f1734..d517f92b6180b 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8821c.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.c @@ -579,9 +579,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