mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-04-15 09:31:32 -04:00
wifi: wfx: simplify exclusion between scan and Rx filters
The device ignore the rx filters during the scan operation. wfx_configure_filter() acquires scan_lock to reflect this restriction. However, it is not really necessary since mac80211 don't try to configure Rx filters during scan. However, the things are changing. The scan operation is going to be used to implement remain-on-channel. In this case, wfx_configure_filter() can be called during the scan. Currently, this scenario generate a delay that end with a timeout in the upper layers. For the final user, some scenario of the EasyConnect specification end with a failure. So, avoid acquiring the scan_lock and just return. Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com> Signed-off-by: Kalle Valo <kvalo@kernel.org> Link: https://lore.kernel.org/r/20231004172843.195332-6-jerome.pouiller@silabs.com
This commit is contained in:
committed by
Kalle Valo
parent
fc5cb24fd5
commit
f091bcb62d
@@ -96,10 +96,12 @@ void wfx_configure_filter(struct ieee80211_hw *hw, unsigned int changed_flags,
|
||||
*total_flags &= FIF_BCN_PRBRESP_PROMISC | FIF_ALLMULTI | FIF_OTHER_BSS |
|
||||
FIF_PROBE_REQ | FIF_PSPOLL;
|
||||
|
||||
/* Filters are ignored during the scan. No frames are filtered. */
|
||||
if (mutex_is_locked(&wvif->scan_lock))
|
||||
return;
|
||||
|
||||
mutex_lock(&wdev->conf_mutex);
|
||||
while ((wvif = wvif_iterate(wdev, wvif)) != NULL) {
|
||||
mutex_lock(&wvif->scan_lock);
|
||||
|
||||
/* Note: FIF_BCN_PRBRESP_PROMISC covers probe response and
|
||||
* beacons from other BSS
|
||||
*/
|
||||
@@ -126,8 +128,6 @@ void wfx_configure_filter(struct ieee80211_hw *hw, unsigned int changed_flags,
|
||||
else
|
||||
filter_prbreq = true;
|
||||
wfx_hif_set_rx_filter(wvif, filter_bssid, filter_prbreq);
|
||||
|
||||
mutex_unlock(&wvif->scan_lock);
|
||||
}
|
||||
mutex_unlock(&wdev->conf_mutex);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user