Merge branch 'refactor/wps_eap_cleanup_v5.5' into 'release/v5.5'

refactor(esp_wifi): Remove WPS task code (v5.5)

See merge request espressif/esp-idf!42441

Author: Jiang Jiang Jian

components/esp_wifi/Kconfig

@@ -814,6 +814,14 @@ menu "Wi-Fi"
                     be shared to other devices, making it in readable format increases
                     that risk, also passphrase requires pbkdf2 to convert in psk.
 
+            config ESP_WIFI_WPS_RECONNECT_ON_FAIL
+                bool "Reconnect to previous SSID if WPS failed"
+                default n
+                help
+                    Select this option to enable reconnection to previous SSID if WPS fails.
+                    This option will only work if station was connected to a network
+                    when WPS was started.
+
         endmenu # "WPS Configuration Options"
 
 

components/wpa_supplicant/CMakeLists.txt

@@ -264,7 +264,6 @@ target_compile_definitions(${COMPONENT_LIB} PRIVATE
     EAP_PEAP
     USE_WPA2_TASK
     CONFIG_WPS
-    USE_WPS_TASK
     ESPRESSIF_USE
     CONFIG_ECC
     CONFIG_IEEE80211W
@@ -291,6 +290,9 @@ endif()
 if(CONFIG_ESP_WIFI_WPS_STRICT)
     target_compile_definitions(${COMPONENT_LIB} PRIVATE CONFIG_WPS_STRICT)
 endif()
+if(CONFIG_ESP_WIFI_WPS_RECONNECT_ON_FAIL)
+    target_compile_definitions(${COMPONENT_LIB} PRIVATE CONFIG_WPS_RECONNECT_ON_FAIL)
+endif()
 if(CONFIG_ESP_WIFI_SUITE_B_192)
     target_compile_definitions(${COMPONENT_LIB} PRIVATE CONFIG_SUITEB192)
 endif()