Skip to content

Commit 1f4fbd0

Browse files
committed
Merge branch 'fix/rrm_config_set_v5.5' into 'release/v5.5'
Set rrm config condition in case RRM monitoring is enabled See merge request espressif/esp-idf!39280
2 parents f97fd74 + b1218ad commit 1f4fbd0

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

components/esp_wifi/wifi_apps/roaming_app/src/roaming_app.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -415,13 +415,17 @@ static void roaming_app_rssi_low_handler(void* arg, esp_event_base_t event_base,
415415
static void trigger_network_assisted_roam(void)
416416
{
417417
#if PERIODIC_RRM_MONITORING
418-
ROAM_NEIGHBOR_LIST_LOCK();
418+
if (g_roaming_app.config.rrm_monitor) {
419+
ROAM_NEIGHBOR_LIST_LOCK();
420+
}
419421
#endif /*PERIODIC_RRM_MONITORING*/
420422
if (esp_wnm_send_bss_transition_mgmt_query(REASON_RSSI, g_roaming_app.btm_neighbor_list, 1) < 0) {
421423
ESP_LOGD(ROAMING_TAG, "failed to send btm query");
422424
}
423425
#if PERIODIC_RRM_MONITORING
424-
ROAM_NEIGHBOR_LIST_UNLOCK();
426+
if (g_roaming_app.config.rrm_monitor) {
427+
ROAM_NEIGHBOR_LIST_UNLOCK();
428+
}
425429
#endif /*PERIODIC_RRM_MONITORING*/
426430
ESP_LOGD(ROAMING_TAG, "Sent BTM Query");
427431
gettimeofday(&g_roaming_app.last_roamed_time, NULL);

0 commit comments

Comments
 (0)