From 4757853836b7e55b11228c02cc0a7b3f0340aa6e Mon Sep 17 00:00:00 2001
From: Shreyas Sheth <shreyas.sheth@espressif.com>
Date: Wed, 23 Jul 2025 14:42:21 +0530
Subject: [PATCH] fix(wifi_apps): Fix crash due to neighbor_list lock

Closes https://github.com/espressif/esp-idf/issues/16976
---
 components/esp_wifi/wifi_apps/roaming_app/src/Kconfig.roaming | 2 +-
 components/esp_wifi/wifi_apps/roaming_app/src/roaming_app.c   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/esp_wifi/wifi_apps/roaming_app/src/Kconfig.roaming b/components/esp_wifi/wifi_apps/roaming_app/src/Kconfig.roaming
index 89ee6b182e..22f641377d 100644
--- a/components/esp_wifi/wifi_apps/roaming_app/src/Kconfig.roaming
+++ b/components/esp_wifi/wifi_apps/roaming_app/src/Kconfig.roaming
@@ -73,7 +73,7 @@ menu "Roaming Methods"
     config ESP_WIFI_ROAMING_NETWORK_ASSISTED_ROAM
         bool "Support Network Assisted roaming using 802.11v"
         depends on ESP_WIFI_WNM_SUPPORT
-        default y
+        default n
         help
             Roaming between APs using network assisted Roaming.
             This involves  BSS Transition Management mechanisms outlined in 802.11v.
diff --git a/components/esp_wifi/wifi_apps/roaming_app/src/roaming_app.c b/components/esp_wifi/wifi_apps/roaming_app/src/roaming_app.c
index b7603683ff..20dcc08366 100644
--- a/components/esp_wifi/wifi_apps/roaming_app/src/roaming_app.c
+++ b/components/esp_wifi/wifi_apps/roaming_app/src/roaming_app.c
@@ -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)
 {
 #if PERIODIC_RRM_MONITORING
-    if (g_roaming_app.config.rrm_monitor) {
+    if (g_roaming_app.current_bss.rrm_support) {
         ROAM_NEIGHBOR_LIST_LOCK();
     }
 #endif /*PERIODIC_RRM_MONITORING*/
@@ -423,7 +423,7 @@ static void trigger_network_assisted_roam(void)
         ESP_LOGD(ROAMING_TAG, "failed to send btm query");
     }
 #if PERIODIC_RRM_MONITORING
-    if (g_roaming_app.config.rrm_monitor) {
+    if (g_roaming_app.current_bss.rrm_support) {
         ROAM_NEIGHBOR_LIST_UNLOCK();
     }
 #endif /*PERIODIC_RRM_MONITORING*/