From nobody Fri Dec 19 17:34:36 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2CD19C04A95 for ; Sat, 22 Oct 2022 08:31:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233942AbiJVIbx (ORCPT ); Sat, 22 Oct 2022 04:31:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233954AbiJVI27 (ORCPT ); Sat, 22 Oct 2022 04:28:59 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DB8392E22AC; Sat, 22 Oct 2022 01:01:42 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1B7B560BA7; Sat, 22 Oct 2022 08:01:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2D24FC433C1; Sat, 22 Oct 2022 08:01:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666425680; bh=f2P4qW12vwATxExY6+WR4wROaknevNhDDR2RJccBt28=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TU5uXb3vC5F3gRcr20CqGYINbREDdgut0oJdd1r6nzI1l9YOaXPML8ktIhX3Fv5c3 0UiwtlPkdHM/MVMNw/YMuWHungG9xkdyv+dr/PksN/j4KGy63bbBHLbbfGxsF8f/Sy VPxEcQPZSLPiTfJtde2ELraGziLfHKX6Pz1y+B9A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Po-Hao Huang , Ping-Ke Shih , Kalle Valo , Sasha Levin Subject: [PATCH 5.19 580/717] wifi: rtw89: fix rx filter after scan Date: Sat, 22 Oct 2022 09:27:39 +0200 Message-Id: <20221022072524.085568032@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221022072415.034382448@linuxfoundation.org> References: <20221022072415.034382448@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Po-Hao Huang [ Upstream commit 812825c2b204c491f1a5586c602e4ac75060493a ] In monitor mode we should be able to received all packets even if it's not destined to us. But after scan, the configuration was wrongly set, so we fix it. Signed-off-by: Po-Hao Huang Signed-off-by: Ping-Ke Shih Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/20220916033811.13862-7-pkshih@realtek.com Signed-off-by: Sasha Levin --- drivers/net/wireless/realtek/rtw89/fw.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless= /realtek/rtw89/fw.c index 4718aced1428..e7f86d84d91d 100644 --- a/drivers/net/wireless/realtek/rtw89/fw.c +++ b/drivers/net/wireless/realtek/rtw89/fw.c @@ -2288,6 +2288,7 @@ void rtw89_hw_scan_start(struct rtw89_dev *rtwdev, st= ruct ieee80211_vif *vif, { struct rtw89_vif *rtwvif =3D (struct rtw89_vif *)vif->drv_priv; struct cfg80211_scan_request *req =3D &scan_req->req; + u32 rx_fltr =3D rtwdev->hal.rx_fltr; u8 mac_addr[ETH_ALEN]; =20 rtwdev->scan_info.scanning_vif =3D vif; @@ -2302,13 +2303,13 @@ void rtw89_hw_scan_start(struct rtw89_dev *rtwdev, = struct ieee80211_vif *vif, ether_addr_copy(mac_addr, vif->addr); rtw89_core_scan_start(rtwdev, rtwvif, mac_addr, true); =20 - rtwdev->hal.rx_fltr &=3D ~B_AX_A_BCN_CHK_EN; - rtwdev->hal.rx_fltr &=3D ~B_AX_A_BC; - rtwdev->hal.rx_fltr &=3D ~B_AX_A_A1_MATCH; + rx_fltr &=3D ~B_AX_A_BCN_CHK_EN; + rx_fltr &=3D ~B_AX_A_BC; + rx_fltr &=3D ~B_AX_A_A1_MATCH; rtw89_write32_mask(rtwdev, rtw89_mac_reg_by_idx(R_AX_RX_FLTR_OPT, RTW89_MAC_0), B_AX_RX_FLTR_CFG_MASK, - rtwdev->hal.rx_fltr); + rx_fltr); } =20 void rtw89_hw_scan_complete(struct rtw89_dev *rtwdev, struct ieee80211_vif= *vif, @@ -2322,9 +2323,6 @@ void rtw89_hw_scan_complete(struct rtw89_dev *rtwdev,= struct ieee80211_vif *vif, if (!vif) return; =20 - rtwdev->hal.rx_fltr |=3D B_AX_A_BCN_CHK_EN; - rtwdev->hal.rx_fltr |=3D B_AX_A_BC; - rtwdev->hal.rx_fltr |=3D B_AX_A_A1_MATCH; rtw89_write32_mask(rtwdev, rtw89_mac_reg_by_idx(R_AX_RX_FLTR_OPT, RTW89_MAC_0), B_AX_RX_FLTR_CFG_MASK, --=20 2.35.1