diff mbox series

[wireless-next,05/15] wifi: iwlwifi: mld: assume wiphy is locked when getting BSS ifaces

Message ID 20250308235203.6ce298d6a44f.Ibc862dfdd6cb2da63781c791b9dc601bd5ce4bdc@changeid
State New
Headers show
Series wifi: iwlwifi: updates - 2025-03-08 | expand

Commit Message

Miri Korenblit March 8, 2025, 10:01 p.m. UTC 
From: Benjamin Berg <benjamin.berg@intel.com>

The code was calling ieee80211_iterate_interfaces, however that
takes a lock of iflist_mtx, which must not be taken recursively. Fix
this by using the appropriate _mtx version that asserts that the wiphy
mutex is already held.

Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
---
 drivers/net/wireless/intel/iwlwifi/mld/iface.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/drivers/net/wireless/intel/iwlwifi/mld/iface.c b/drivers/net/wireless/intel/iwlwifi/mld/iface.c
index 691062b44461..e49e2260ac05 100644
--- a/drivers/net/wireless/intel/iwlwifi/mld/iface.c
+++ b/drivers/net/wireless/intel/iwlwifi/mld/iface.c
@@ -465,10 +465,10 @@  u8 iwl_mld_get_fw_bss_vifs_ids(struct iwl_mld *mld)
 {
 	u8 fw_id_bitmap = 0;
 
-	ieee80211_iterate_interfaces(mld->hw,
-				     IEEE80211_IFACE_SKIP_SDATA_NOT_IN_DRIVER,
-				     iwl_mld_get_fw_id_bss_bitmap_iter,
-				     &fw_id_bitmap);
+	ieee80211_iterate_active_interfaces_mtx(mld->hw,
+						IEEE80211_IFACE_SKIP_SDATA_NOT_IN_DRIVER,
+						iwl_mld_get_fw_id_bss_bitmap_iter,
+						&fw_id_bitmap);
 
 	return fw_id_bitmap;
 }