Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2534062lqp; Mon, 25 Mar 2024 01:29:34 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUtZmbHLe82En18K80RSAwtS3imBq8a++LzNTXS8IFT7BHEfq41Ybxa+2v/IanxetZu5/+Uctmt6suuoVTQHGJG8v+zrXTxxBML7V9H1g== X-Google-Smtp-Source: AGHT+IFfDW84ZdHqdzS0aCNFwH9VQQeg3Qd2HTAzlI2IiwY0eYIdhFdAxRiy8o+p+DgNREvEIToE X-Received: by 2002:a05:6122:104a:b0:4cd:20ea:35aa with SMTP id z10-20020a056122104a00b004cd20ea35aamr3348050vkn.8.1711355374270; Mon, 25 Mar 2024 01:29:34 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711355374; cv=pass; d=google.com; s=arc-20160816; b=Fwtwa5sNy8KBviW9//B7CJPsCeFuKRPhO9UTCz0j87cTGQskFXE87kX3ogQdNtR2X0 5mrwLeISlHdi914xxXwj9mwluoCWficz1Fwg6nbA1Ud5uA+fZ/Chmkqoxi0JYN1AsZMs 1KOTf/VD/16GKGQVU517+57PSNdLqGXnPwM0sOaV+k8EhAwkLM1jyEwx2l9o28WLINlb bsVpzlNugNtn/3RT3B04DQ9785frzl5w6g0cyb4o3jQTAngD08HFdq/znZIY9MHdhirT vJg2Knub4A9HJra1rIUevHAaZLAOijseRtOpuOsTaLD1RVFmJ5O6vRwKvC/CabWvsXxd AF6A== 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=W5qqsTU44zXnvrp0Rue5U0YXJponMdhce73TgvC8QOk=; fh=RfApuWMrCBQYs6j8reEIHEe4vQngvgoyYVaRxNjhx6g=; b=rK37AjYz8PCLapbNVYixDIXc84hBig+iy7psFbAqkQE1YCvWcoqZd+qma8zM7TXS/W 0AAsPYljFqlnogZAZiEfvTZv9megc+qqpx245fKG2QqK7Zbc7BdSvu037yA+s+dSrwcd 44S4I/tMOn26E4w8G/hKGFqCagJPepACohJ+XzI4fuS7m8VV9nGvD6aD2C54qHtgUN7R dEUQTl4zOu1vloP3IgrjFhHt1d49Vi0Mbs1TP6vz/LRSa62Pl2soU9QKcTeNG2LQdviR O/1tsUuTldB+HeMK0iLM75iqmkjbprmmekTNvf63Yau0BFrfTt30KAW4Out3zsNxAgyC PI4w==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=L7nb77+Z; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-116036-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-116036-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. [147.75.199.223]) by mx.google.com with ESMTPS id eq6-20020ad45966000000b00696851210adsi3160260qvb.112.2024.03.25.01.29.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 01:29:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-116036-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=L7nb77+Z; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-116036-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-116036-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 02DB51C2FA1D for ; Mon, 25 Mar 2024 08:29:34 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 91FA3270C8F; Mon, 25 Mar 2024 03:28:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="L7nb77+Z" 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 0C6EE2779F5; Sun, 24 Mar 2024 23:37:01 +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=1711323422; cv=none; b=ilkDm4bTMdq50/7RjqnOPxYT2b8pkc77yOvE9fs3rbH3urIJHWMPMGNUU0kZnqNmeeL/kZKUgC5xVDAR6+TASP1TrgzOn8Wj1VM/rJQqABn69BUXUp2Bxfxzd9thAmmCCb/8ue527tMVqex4GhtfZDVRviiNfA4JYQehKAlgMN8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711323422; c=relaxed/simple; bh=Cv9w4bOvSKRavjM5gb4NUer3PfrI7P2NyWfqZ31Y0Hg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ayaKoahkalNUknDPYMCNSHSDsoVhMQpnZ0hFLwAZRg/OVmWI524s0M/iQVBucIpQajCG+QR3ovdRB/kJzJnWtvZpEOqwt3hrrTcAAcMg7i5JVuyXA8S5X3DsxemLObpsVuyAiwcJes7NCn9UOriVRA8IIlfEj4tpewSFtwzoT8Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=L7nb77+Z; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 33BEFC43390; Sun, 24 Mar 2024 23:37:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711323420; bh=Cv9w4bOvSKRavjM5gb4NUer3PfrI7P2NyWfqZ31Y0Hg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L7nb77+ZGGjnhhZix2wFJkBC5wgXsyDRQWFspgj0cvjPxpZaufb7JCKIPhcuDMPV6 cEz+UXZQC6dwVa3C32ev/g00tNnLkDdIS1yKgLu0sOK4o/FvOkd/BJ7i9ztCyvMwXb Jnts1NeCH3QlR9v19e7hOREn+CKVkF6sWQupBDcVY/K2Z/G0CNZti3q1tVjP1aW6lN Ohwt61gPIODrJokDTn79xoicO4y4eFu3H5vF091rcXWHxJYugAsCycwfBIjU1AH0aR iazUhX/oWl+aH3AeB8zP+kpaEuYkDEYauhvcso4ag2v1HnSeBCJ/I1MhkULkBnxhS4 bkjcbBEbxPNPA== 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.15 123/317] wifi: rtw88: 8821c: Fix false alarm count Date: Sun, 24 Mar 2024 19:31:43 -0400 Message-ID: <20240324233458.1352854-124-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324233458.1352854-1-sashal@kernel.org> References: <20240324233458.1352854-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 280602a34fe67..eb66f494382ae 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8821c.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.c @@ -667,9 +667,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