Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2381416lqp; Sun, 24 Mar 2024 16:55:16 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWy8ryMYheuIyYKD4AHFzRcoeCJLWRTLRTK1b8c2NqFxirqzlcc7L8UTA3y/9n3htmknoGHD58lmxZ6w6NaZe6W/o0seBjKOMCvEU1ULA== X-Google-Smtp-Source: AGHT+IGyugQtuvqToEcTC4TvGICLL6WqNjF3lqq7Gct9iGYGSgNiTNgAPJqYOpz8QPwTLYpl8Ofj X-Received: by 2002:a9d:7a8f:0:b0:6e6:bcc9:6406 with SMTP id l15-20020a9d7a8f000000b006e6bcc96406mr6581223otn.31.1711324516040; Sun, 24 Mar 2024 16:55:16 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711324516; cv=pass; d=google.com; s=arc-20160816; b=sPnn2nYI101lnPgbCh2k+ba4ct4WkjR7kxDI/gdRgdjPZvho64V8pksuhLvaS5NzA0 gLzUkI2CrZ0qz47OwY+NOab7NoweinxUd9/ovi/V7/6UUoH7FU9+DSDoF1udJy/37MfT EQL80FB67iHdfyuitcknJF/GwNxPjYAx13pKKByKbIvZFeEThlkyxCS+XVj0/ClCZ9xJ LzARZdWVPU0A2tog6lehcjZbxhQjn00Gvvtd9KooTAKue0RQhox5HKmcAADe2zf/S5GS 0U+V3DnDYXoxPRuDHUgy4ixrqR0fByDDERg7lhUGJWN5xOQKIvOrXHModZX6g78iEzNW LhzA== 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=RdkApJa5XSA/Ub6HZVvgiOYEBILJiWW5Hg1QSOHYURE=; fh=RfApuWMrCBQYs6j8reEIHEe4vQngvgoyYVaRxNjhx6g=; b=TiH3g8NF30oLaapW6I3BfrZHFBa1CMDZIZO3Pbx9tFZVgEdcdHNrjlhxeJFLAmIobp 7zGW9vApkbfWm+QCGBm2JNWNiSFqzMqEv3uxdb1IfWwBnAtMBkm9YvZIPP303AkjIzgt f7tfAHsD+XmDP6Q5HjsS5fcnQjqmD4uaebXaCxvTTlgtqND1V317O1Tdt/rQjVU/9izl lvIqGGK8wy6dszJ81I3m78V1Gc48mqew29fVYc1Lf7vIgwnBpW/dleI3WUIek2DNIk5a CaLsL5jCthvqmDBEd/qXcX5XC0Ece+Vu0aR7/vhwd9BFhUPpxDr1T7TUOmKSMBsggSHu NT0Q==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=WUmm2wIA; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-113180-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-113180-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 l68-20020a633e47000000b005dc071d13c7si6299138pga.273.2024.03.24.16.55.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Mar 2024 16:55:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-113180-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=WUmm2wIA; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-113180-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-113180-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 A08B0284B1C for ; Sun, 24 Mar 2024 23:37:53 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8346813C667; Sun, 24 Mar 2024 22:39:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="WUmm2wIA" 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 98C10176A16; Sun, 24 Mar 2024 22:39:42 +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=1711319982; cv=none; b=gnA2n97de4ugSq9uLXdask5IlrjgAyV+eGcYIEss64Z8cL9fkC11uTG+piCeOMIRnhJySWasEWjUhnmyc02l8fyRkW/pHgk81ZQYqskQOJ462UFqKPaOyTFYpGYXUPFNxLvc7A/vzPgc85b213sU5of8P/C5XPMRFRRthTMupbE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711319982; c=relaxed/simple; bh=mZScqgdFbFxEEZ5oStzghiuQovEy8pryA8k/LHb0adw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YT20pG2bH/GzuVrid9cCLW+QUk+GrVPhtYRWXjhTRLoVkIk+E8OmcbLUEjIeoA5tyWgLQI6+7xcTJB7pCQVAdyvYue3PGN0qGersrTpoQcBbxsgsOfPN1vo49ng/9PvFW21r+1oQq5oKfBJOSs7NKyLVmbAuzZIlIFQ6qA0Cahc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WUmm2wIA; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id C099CC433C7; Sun, 24 Mar 2024 22:39:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711319982; bh=mZScqgdFbFxEEZ5oStzghiuQovEy8pryA8k/LHb0adw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WUmm2wIAcelmmQiMkz52P3562qBLl7o+Y9b3iZXYTukAs9heGY+MkSeUC80WLrA87 7fzBqh298PzrFcxxE/3mZjXciDH4JmOJ0Ee9qdWJK2u+lv3U+Ja0d6Ly9j53XBxetR a86VEAr0MFlwIS3584DVDgZlYvP/Zd8RYdJkHoCsASQtdl0FV/SI7M9O7W4FA7lpmz vIAxZ5SV5ORg1aCCI62jXypz8xxcSTKNzi5gBJD5veaK715evbzAwoKDRduZtilvC/ M9pSjm2qKebTqSxaGiLxs+QvjU8hdGaHg1dYl6CIHWtvYpAaKbTHsQhnBZ86YRbL5a 9ZKpx/oBmQeCA== 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.8 289/715] wifi: rtw88: 8821c: Fix false alarm count Date: Sun, 24 Mar 2024 18:27:48 -0400 Message-ID: <20240324223455.1342824-290-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324223455.1342824-1-sashal@kernel.org> References: <20240324223455.1342824-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 429bb420b0563..fe5d8e1883509 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8821c.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.c @@ -773,9 +773,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