Merge branch 'bugfix/roam_app_neighbor_crash' into 'master'

fix(wifi_apps): Fix crash due to neighbor_list lock

Closes IDFGH-16029

See merge request espressif/esp-idf!40854
This commit is contained in:
Kapil Gupta
2025-09-23 14:24:18 +05:30
2 changed files with 3 additions and 3 deletions

View File

@@ -73,7 +73,7 @@ menu "Roaming Methods"
config ESP_WIFI_ROAMING_NETWORK_ASSISTED_ROAM config ESP_WIFI_ROAMING_NETWORK_ASSISTED_ROAM
bool "Support Network Assisted roaming using 802.11v" bool "Support Network Assisted roaming using 802.11v"
depends on ESP_WIFI_WNM_SUPPORT depends on ESP_WIFI_WNM_SUPPORT
default y default n
help help
Roaming between APs using network assisted Roaming. Roaming between APs using network assisted Roaming.
This involves BSS Transition Management mechanisms outlined in 802.11v. This involves BSS Transition Management mechanisms outlined in 802.11v.

View File

@@ -415,7 +415,7 @@ static void roaming_app_rssi_low_handler(void* arg, esp_event_base_t event_base,
static void trigger_network_assisted_roam(void) static void trigger_network_assisted_roam(void)
{ {
#if PERIODIC_RRM_MONITORING #if PERIODIC_RRM_MONITORING
if (g_roaming_app.config.rrm_monitor) { if (g_roaming_app.current_bss.rrm_support) {
ROAM_NEIGHBOR_LIST_LOCK(); ROAM_NEIGHBOR_LIST_LOCK();
} }
#endif /*PERIODIC_RRM_MONITORING*/ #endif /*PERIODIC_RRM_MONITORING*/
@@ -423,7 +423,7 @@ static void trigger_network_assisted_roam(void)
ESP_LOGD(ROAMING_TAG, "failed to send btm query"); ESP_LOGD(ROAMING_TAG, "failed to send btm query");
} }
#if PERIODIC_RRM_MONITORING #if PERIODIC_RRM_MONITORING
if (g_roaming_app.config.rrm_monitor) { if (g_roaming_app.current_bss.rrm_support) {
ROAM_NEIGHBOR_LIST_UNLOCK(); ROAM_NEIGHBOR_LIST_UNLOCK();
} }
#endif /*PERIODIC_RRM_MONITORING*/ #endif /*PERIODIC_RRM_MONITORING*/