mirror of
https://github.com/espressif/esp-idf.git
synced 2024-10-05 20:47:46 -04:00
Merge branch 'bugfix/deinit_roaming_app_crash' into 'master'
fix(esp_wifi): Fix crash in wifi deinit due to roaming neighbor list Closes WIFIBUG-656 See merge request espressif/esp-idf!32418
This commit is contained in:
commit
2a222d437e
@ -35,9 +35,11 @@ static void *scan_results_lock = NULL;
|
||||
#define ROAM_SCAN_RESULTS_LOCK() os_mutex_lock(scan_results_lock)
|
||||
#define ROAM_SCAN_RESULTS_UNLOCK() os_mutex_unlock(scan_results_lock)
|
||||
|
||||
#if PERIODIC_RRM_MONITORING
|
||||
static void *neighbor_list_lock = NULL;
|
||||
#define ROAM_NEIGHBOR_LIST_LOCK() os_mutex_lock(neighbor_list_lock)
|
||||
#define ROAM_NEIGHBOR_LIST_UNLOCK() os_mutex_unlock(neighbor_list_lock)
|
||||
#endif /*PERIODIC_RRM_MONITORING*/
|
||||
|
||||
static int wifi_post_roam_event(struct cand_bss *bss);
|
||||
static void determine_best_ap(int8_t rssi_threshold);
|
||||
@ -815,8 +817,15 @@ void deinit_roaming_app(void)
|
||||
#if PERIODIC_SCAN_MONITORING
|
||||
g_roaming_app.periodic_scan_active = false;
|
||||
#endif /*PERIODIC_SCAN_MONITORING*/
|
||||
os_mutex_delete(neighbor_list_lock);
|
||||
neighbor_list_lock = NULL;
|
||||
os_mutex_delete(scan_results_lock);
|
||||
scan_results_lock = NULL;
|
||||
|
||||
#if PERIODIC_RRM_MONITORING
|
||||
if (neighbor_list_lock) {
|
||||
os_mutex_delete(neighbor_list_lock);
|
||||
neighbor_list_lock = NULL;
|
||||
}
|
||||
#endif /*PERIODIC_RRM_MONITORING*/
|
||||
if (scan_results_lock) {
|
||||
os_mutex_delete(scan_results_lock);
|
||||
scan_results_lock = NULL;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user