From f38144a689ff18bb773640a7e24b874a6f92b93e Mon Sep 17 00:00:00 2001
From: Nachiket Kukade <nachiket.kukade@espressif.com>
Date: Thu, 23 Dec 2021 16:38:42 +0530
Subject: [PATCH] esp_wifi: Miscellaneous FTM bugfixes

1. Update wifi libs with bugfixes for corner cases
2. Avoid ASSERT for scan failure in FTM example

Closes https://github.com/espressif/esp-idf/issues/8127
---
 components/esp_wifi/lib           | 2 +-
 examples/wifi/ftm/main/ftm_main.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index 428480bbb9..5ae7e325b8 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit 428480bbb90442db61fb20fed9980dd035245fe9
+Subproject commit 5ae7e325b89bc2d0799e2de6fcaccf41ffdbb408
diff --git a/examples/wifi/ftm/main/ftm_main.c b/examples/wifi/ftm/main/ftm_main.c
index fe3e2bec3d..2d3eaf23ba 100644
--- a/examples/wifi/ftm/main/ftm_main.c
+++ b/examples/wifi/ftm/main/ftm_main.c
@@ -261,7 +261,10 @@ static bool wifi_perform_scan(const char *ssid, bool internal)
     uint8_t i;
 
     ESP_ERROR_CHECK( esp_wifi_set_mode(WIFI_MODE_STA) );
-    ESP_ERROR_CHECK( esp_wifi_scan_start(&scan_config, true) );
+    if (ESP_OK != esp_wifi_scan_start(&scan_config, true)) {
+        ESP_LOGI(TAG_STA, "Failed to perform scan");
+        return false;
+    }
 
     esp_wifi_scan_get_ap_num(&g_scan_ap_num);
     if (g_scan_ap_num == 0) {