From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Po-Hao Huang <phhuang@realtek.com>,
Ping-Ke Shih <pkshih@realtek.com>, Kalle Valo <kvalo@kernel.org>,
Sasha Levin <sashal@kernel.org>,
davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
pabeni@redhat.com, linux-wireless@vger.kernel.org,
netdev@vger.kernel.org
Subject: [PATCH AUTOSEL 5.19 40/73] wifi: rtw89: fix rx filter after scan
Date: Sun, 9 Oct 2022 18:14:18 -0400 [thread overview]
Message-ID: <20221009221453.1216158-40-sashal@kernel.org> (raw)
In-Reply-To: <20221009221453.1216158-1-sashal@kernel.org>
From: Po-Hao Huang <phhuang@realtek.com>
[ 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 <phhuang@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220916033811.13862-7-pkshih@realtek.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
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, struct ieee80211_vif *vif,
{
struct rtw89_vif *rtwvif = (struct rtw89_vif *)vif->drv_priv;
struct cfg80211_scan_request *req = &scan_req->req;
+ u32 rx_fltr = rtwdev->hal.rx_fltr;
u8 mac_addr[ETH_ALEN];
rtwdev->scan_info.scanning_vif = 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);
- rtwdev->hal.rx_fltr &= ~B_AX_A_BCN_CHK_EN;
- rtwdev->hal.rx_fltr &= ~B_AX_A_BC;
- rtwdev->hal.rx_fltr &= ~B_AX_A_A1_MATCH;
+ rx_fltr &= ~B_AX_A_BCN_CHK_EN;
+ rx_fltr &= ~B_AX_A_BC;
+ rx_fltr &= ~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);
}
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;
- rtwdev->hal.rx_fltr |= B_AX_A_BCN_CHK_EN;
- rtwdev->hal.rx_fltr |= B_AX_A_BC;
- rtwdev->hal.rx_fltr |= 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,
--
2.35.1
next prev parent reply other threads:[~2022-10-09 22:24 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20221009221453.1216158-1-sashal@kernel.org>
2022-10-09 22:13 ` [PATCH AUTOSEL 5.19 02/73] wifi: rtw88: phy: fix warning of possible buffer overflow Sasha Levin
2022-10-09 22:13 ` [PATCH AUTOSEL 5.19 03/73] wifi: ath10k: Set tx credit to one for WCN3990 snoc based devices Sasha Levin
2022-10-09 22:13 ` [PATCH AUTOSEL 5.19 04/73] wifi: brcmfmac: fix invalid address access when enabling SCAN log level Sasha Levin
2022-10-09 22:13 ` [PATCH AUTOSEL 5.19 06/73] ice: set tx_tstamps when creating new Tx rings via ethtool Sasha Levin
2022-10-09 22:13 ` [PATCH AUTOSEL 5.19 07/73] net: ethernet: ti: davinci_mdio: Add workaround for errata i2329 Sasha Levin
2022-10-09 22:13 ` [PATCH AUTOSEL 5.19 08/73] openvswitch: Fix double reporting of drops in dropwatch Sasha Levin
2022-10-09 22:13 ` [PATCH AUTOSEL 5.19 09/73] openvswitch: Fix overreporting " Sasha Levin
2022-10-09 22:13 ` [PATCH AUTOSEL 5.19 10/73] net: dsa: all DSA masters must be down when changing the tagging protocol Sasha Levin
2022-10-10 11:53 ` Vladimir Oltean
2022-10-09 22:13 ` [PATCH AUTOSEL 5.19 11/73] net: mscc: ocelot: adjust forwarding domain for CPU ports in a LAG Sasha Levin
2022-10-10 11:58 ` Vladimir Oltean
2022-10-09 22:13 ` [PATCH AUTOSEL 5.19 12/73] tcp: annotate data-race around tcp_md5sig_pool_populated Sasha Levin
2022-10-09 22:13 ` [PATCH AUTOSEL 5.19 13/73] micrel: ksz8851: fixes struct pointer issue Sasha Levin
2022-10-09 22:13 ` [PATCH AUTOSEL 5.19 14/73] genetlink: hold read cb_lock during iteration of genl_fam_idr in genl_bind() Sasha Levin
2022-10-09 22:13 ` [PATCH AUTOSEL 5.19 15/73] net: dsa: mv88e6xxx: Allow external SMI if serial Sasha Levin
2022-10-10 11:53 ` Vladimir Oltean
2022-10-09 22:13 ` [PATCH AUTOSEL 5.19 17/73] wifi: ath9k: avoid uninit memory read in ath9k_htc_rx_msg() Sasha Levin
2022-10-09 22:13 ` [PATCH AUTOSEL 5.19 20/73] net: axienet: Switch to 64-bit RX/TX statistics Sasha Levin
2022-10-09 22:13 ` [PATCH AUTOSEL 5.19 21/73] net-next: Fix IP_UNICAST_IF option behavior for connected sockets Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 22/73] xfrm: Update ipcomp_scratches with NULL when freed Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 23/73] wifi: ath11k: Register shutdown handler for WCN6750 Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 24/73] rtw89: ser: leave lps with mutex Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 25/73] net: broadcom: Fix return type for implementation of Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 26/73] net: xscale: Fix return type for implementation of ndo_start_xmit Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 27/73] net: sunplus: " Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 28/73] net: lantiq_etop: " Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 29/73] netlink: Bounds-check struct nlmsgerr creation Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 30/73] net: ftmac100: fix endianness-related issues from 'sparse' Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 31/73] iavf: Fix race between iavf_close and iavf_reset_task Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 32/73] wifi: brcmfmac: fix use-after-free bug in brcmf_netdev_start_xmit() Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 33/73] net: sparx5: fix function return type to match actual type Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 34/73] net: mscc: ocelot: report FIFO drop counters through stats->rx_dropped Sasha Levin
2022-10-10 11:58 ` Vladimir Oltean
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 37/73] wifi: ath11k: mhi: fix potential memory leak in ath11k_mhi_register() Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 38/73] wifi: mt76: mt7921: reset msta->airtime_ac while clearing up hw value Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 39/73] wifi: rtw89: free unused skb to prevent memory leak Sasha Levin
2022-10-09 22:14 ` Sasha Levin [this message]
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 41/73] Bluetooth: L2CAP: initialize delayed works at l2cap_chan_create() Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 42/73] net: ax88796c: Fix return type of ax88796c_start_xmit Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 43/73] net: davicom: Fix return type of dm9000_start_xmit Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 44/73] net: ethernet: ti: davinci_emac: Fix return type of emac_dev_xmit Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 45/73] net: ethernet: litex: Fix return type of liteeth_start_xmit Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 46/73] net: korina: Fix return type of korina_send_packet Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 47/73] net: wwan: iosm: Fix return type of ipc_wwan_link_transmit Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 48/73] net: wwan: t7xx: Fix return type of t7xx_ccmni_start_xmit Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 49/73] net: sfp: re-implement soft state polling setup Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 50/73] net: sfp: move quirk handling into sfp.c Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 51/73] net: sfp: move Alcatel Lucent 3FE46541AA fixup Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 52/73] net/sched: taprio: taprio_dump and taprio_change are protected by rtnl_mutex Sasha Levin
2022-10-10 11:58 ` Vladimir Oltean
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 53/73] Bluetooth: hci_sysfs: Fix attempting to call device_add multiple times Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 54/73] wifi: ath10k: reset pointer after memory free to avoid potential use-after-free Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 55/73] bnxt_en: replace reset with config timestamps Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 57/73] can: bcm: check the result of can_send() in bcm_can_tx() Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 58/73] wifi: rt2x00: don't run Rt5592 IQ calibration on MT7620 Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 59/73] wifi: rt2x00: set correct TX_SW_CFG1 MAC register for MT7620 Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 60/73] wifi: rt2x00: set VGC gain for both chains of MT7620 Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 61/73] wifi: rt2x00: set SoC wmac clock register Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 62/73] wifi: rt2x00: correctly set BBP register 86 for MT7620 Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 64/73] net: If sock is dead don't access sock's sk_wq in sk_stream_wait_memory Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 66/73] bpf: use bpf_prog_pack for bpf_dispatcher Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 67/73] Bluetooth: L2CAP: Fix user-after-free Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 68/73] net: sched: cls_u32: Avoid memcpy() false-positive warning Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 71/73] net: sparx5: Fix return type of sparx5_port_xmit_impl Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 72/73] net: lan966x: Fix return type of lan966x_port_xmit Sasha Levin
2022-10-09 22:14 ` [PATCH AUTOSEL 5.19 73/73] r8152: Rate limit overflow messages Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221009221453.1216158-40-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=kvalo@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=phhuang@realtek.com \
--cc=pkshih@realtek.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).