fix(v5.5): Update per tagged version

david-cermak · david-cermak · commit 3156b08b2ce7 · 2025-10-15T16:15:04.000+02:00
diff --git a/components/esp_wifi_remote/idf_v5.5/Kconfig.soc_wifi_caps.in b/components/esp_wifi_remote/idf_v5.5/Kconfig.soc_wifi_caps.in
@@ -348,7 +348,7 @@ if SLAVE_IDF_TARGET_ESP32C61
 
     config SLAVE_SOC_WIFI_FTM_SUPPORT # ignore: multiple-definition
         bool
-        default y
+        default n
 
     config SLAVE_SOC_WIFI_GCMP_SUPPORT # ignore: multiple-definition
         bool
diff --git a/components/esp_wifi_remote/idf_v5.5/Kconfig.wifi.in b/components/esp_wifi_remote/idf_v5.5/Kconfig.wifi.in
@@ -552,7 +552,6 @@ config WIFI_RMT_NAN_ENABLE
     bool "WiFi Aware"
     default n
     depends on SLAVE_SOC_WIFI_NAN_SUPPORT
-    select LWIP_IPV6
     help
         Enable WiFi Aware (NAN) feature.
 
diff --git a/components/esp_wifi_remote/idf_v5.5/esp_eap_client_remote_weak.c b/components/esp_wifi_remote/idf_v5.5/esp_eap_client_remote_weak.c
@@ -126,8 +126,3 @@ WEAK esp_err_t esp_eap_client_remote_set_domain_name(const char *domain_name)
 {
     LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);
 }
-
-WEAK esp_err_t esp_eap_client_remote_set_eap_methods(esp_eap_method_t methods)
-{
-    LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);
-}
diff --git a/components/esp_wifi_remote/idf_v5.5/esp_eap_client_with_remote.c b/components/esp_wifi_remote/idf_v5.5/esp_eap_client_with_remote.c
@@ -121,8 +121,3 @@ esp_err_t esp_eap_client_set_domain_name(const char *domain_name)
 {
     return esp_eap_client_remote_set_domain_name(domain_name);
 }
-
-esp_err_t esp_eap_client_set_eap_methods(esp_eap_method_t methods)
-{
-    return esp_eap_client_remote_set_eap_methods(methods);
-}
diff --git a/components/esp_wifi_remote/idf_v5.5/include/esp_eap_client_remote_api.h b/components/esp_wifi_remote/idf_v5.5/include/esp_eap_client_remote_api.h
@@ -34,7 +34,6 @@ esp_err_t esp_eap_client_remote_set_fast_params(esp_eap_fast_config config);
 esp_err_t esp_eap_client_remote_use_default_cert_bundle(_Bool use_default_bundle);
 void esp_wifi_remote_set_okc_support(_Bool enable);
 esp_err_t esp_eap_client_remote_set_domain_name(const char *domain_name);
-esp_err_t esp_eap_client_remote_set_eap_methods(esp_eap_method_t methods);
 
 #ifdef __cplusplus
 }
diff --git a/components/esp_wifi_remote/idf_v5.5/include/esp_wifi_default_config.h b/components/esp_wifi_remote/idf_v5.5/include/esp_wifi_default_config.h
@@ -9,6 +9,7 @@
 #if CONFIG_SLAVE_IDF_TARGET_ESP32
 #define CONFIG_ESP_WIFI_REMOTE_ENABLED 1
 #define CONFIG_ESP_IDF_VERSION "5.5"
+#define CONFIG_ESP_WIFI_REMOTE_IDF_SPECIFIC_ADDED 1
 #define CONFIG_SLAVE_IDF_TARGET_ESP32 1
 #define CONFIG_SLAVE_SOC_WIFI_SUPPORTED 1
 #define CONFIG_SLAVE_SOC_WIFI_WAPI_SUPPORT 1
@@ -87,6 +88,7 @@
 #if CONFIG_SLAVE_IDF_TARGET_ESP32S2
 #define CONFIG_ESP_WIFI_REMOTE_ENABLED 1
 #define CONFIG_ESP_IDF_VERSION "5.5"
+#define CONFIG_ESP_WIFI_REMOTE_IDF_SPECIFIC_ADDED 1
 #define CONFIG_SLAVE_IDF_TARGET_ESP32S2 1
 #define CONFIG_SLAVE_SOC_WIFI_SUPPORTED 1
 #define CONFIG_SLAVE_SOC_WIFI_WAPI_SUPPORT 1
@@ -168,6 +170,7 @@
 #if CONFIG_SLAVE_IDF_TARGET_ESP32C3
 #define CONFIG_ESP_WIFI_REMOTE_ENABLED 1
 #define CONFIG_ESP_IDF_VERSION "5.5"
+#define CONFIG_ESP_WIFI_REMOTE_IDF_SPECIFIC_ADDED 1
 #define CONFIG_SLAVE_IDF_TARGET_ESP32C3 1
 #define CONFIG_SLAVE_SOC_WIFI_SUPPORTED 1
 #define CONFIG_SLAVE_SOC_WIFI_WAPI_SUPPORT 1
@@ -250,6 +253,7 @@
 #if CONFIG_SLAVE_IDF_TARGET_ESP32S3
 #define CONFIG_ESP_WIFI_REMOTE_ENABLED 1
 #define CONFIG_ESP_IDF_VERSION "5.5"
+#define CONFIG_ESP_WIFI_REMOTE_IDF_SPECIFIC_ADDED 1
 #define CONFIG_SLAVE_IDF_TARGET_ESP32S3 1
 #define CONFIG_SLAVE_SOC_WIFI_SUPPORTED 1
 #define CONFIG_SLAVE_SOC_WIFI_WAPI_SUPPORT 1
@@ -332,6 +336,7 @@
 #if CONFIG_SLAVE_IDF_TARGET_ESP32C2
 #define CONFIG_ESP_WIFI_REMOTE_ENABLED 1
 #define CONFIG_ESP_IDF_VERSION "5.5"
+#define CONFIG_ESP_WIFI_REMOTE_IDF_SPECIFIC_ADDED 1
 #define CONFIG_SLAVE_IDF_TARGET_ESP32C2 1
 #define CONFIG_SLAVE_SOC_WIFI_SUPPORTED 1
 #define CONFIG_SLAVE_SOC_WIFI_SUPPORT_VARIABLE_BEACON_WINDOW 1
@@ -412,6 +417,7 @@
 #if CONFIG_SLAVE_IDF_TARGET_ESP32C6
 #define CONFIG_ESP_WIFI_REMOTE_ENABLED 1
 #define CONFIG_ESP_IDF_VERSION "5.5"
+#define CONFIG_ESP_WIFI_REMOTE_IDF_SPECIFIC_ADDED 1
 #define CONFIG_SLAVE_IDF_TARGET_ESP32C6 1
 #define CONFIG_SLAVE_SOC_WIFI_SUPPORTED 1
 #define CONFIG_SLAVE_SOC_WIFI_WAPI_SUPPORT 1
@@ -502,6 +508,7 @@
 #if CONFIG_SLAVE_IDF_TARGET_ESP32H2
 #define CONFIG_ESP_WIFI_REMOTE_ENABLED 1
 #define CONFIG_ESP_IDF_VERSION "5.5"
+#define CONFIG_ESP_WIFI_REMOTE_IDF_SPECIFIC_ADDED 1
 #define CONFIG_SLAVE_IDF_TARGET_ESP32 1
 #define CONFIG_SLAVE_SOC_WIFI_SUPPORTED 1
 #define CONFIG_SLAVE_SOC_WIFI_WAPI_SUPPORT 1
@@ -580,6 +587,7 @@
 #if CONFIG_SLAVE_IDF_TARGET_ESP32P4
 #define CONFIG_ESP_WIFI_REMOTE_ENABLED 1
 #define CONFIG_ESP_IDF_VERSION "5.5"
+#define CONFIG_ESP_WIFI_REMOTE_IDF_SPECIFIC_ADDED 1
 #define CONFIG_SLAVE_IDF_TARGET_ESP32 1
 #define CONFIG_SLAVE_SOC_WIFI_SUPPORTED 1
 #define CONFIG_SLAVE_SOC_WIFI_WAPI_SUPPORT 1
@@ -658,6 +666,7 @@
 #if CONFIG_SLAVE_IDF_TARGET_ESP32C5
 #define CONFIG_ESP_WIFI_REMOTE_ENABLED 1
 #define CONFIG_ESP_IDF_VERSION "5.5"
+#define CONFIG_ESP_WIFI_REMOTE_IDF_SPECIFIC_ADDED 1
 #define CONFIG_SLAVE_IDF_TARGET_ESP32C5 1
 #define CONFIG_SLAVE_SOC_WIFI_SUPPORTED 1
 #define CONFIG_SLAVE_SOC_WIFI_WAPI_SUPPORT 1
@@ -751,6 +760,7 @@
 #if CONFIG_SLAVE_IDF_TARGET_ESP32C61
 #define CONFIG_ESP_WIFI_REMOTE_ENABLED 1
 #define CONFIG_ESP_IDF_VERSION "5.5"
+#define CONFIG_ESP_WIFI_REMOTE_IDF_SPECIFIC_ADDED 1
 #define CONFIG_SLAVE_IDF_TARGET_ESP32C61 1
 #define CONFIG_SLAVE_SOC_WIFI_SUPPORTED 1
 #define CONFIG_SLAVE_SOC_WIFI_WAPI_SUPPORT 1
@@ -759,7 +769,6 @@
 #define CONFIG_SLAVE_SOC_WIFI_NAN_SUPPORT 1
 #define CONFIG_SLAVE_SOC_WIFI_LIGHT_SLEEP_CLK_WIDTH 12
 #define CONFIG_SLAVE_SOC_WIFI_HW_TSF 1
-#define CONFIG_SLAVE_SOC_WIFI_FTM_SUPPORT 1
 #define CONFIG_SLAVE_FREERTOS_UNICORE 1
 #define CONFIG_SLAVE_SOC_WIFI_GCMP_SUPPORT 1
 #define CONFIG_SLAVE_IDF_TARGET_ARCH_RISCV 1
@@ -842,6 +851,7 @@
 #if CONFIG_SLAVE_IDF_TARGET_ESP32H21
 #define CONFIG_ESP_WIFI_REMOTE_ENABLED 1
 #define CONFIG_ESP_IDF_VERSION "5.5"
+#define CONFIG_ESP_WIFI_REMOTE_IDF_SPECIFIC_ADDED 1
 #define CONFIG_SLAVE_IDF_TARGET_ESP32 1
 #define CONFIG_SLAVE_SOC_WIFI_SUPPORTED 1
 #define CONFIG_SLAVE_SOC_WIFI_WAPI_SUPPORT 1
@@ -920,6 +930,7 @@
 #if CONFIG_SLAVE_IDF_TARGET_ESP32H4
 #define CONFIG_ESP_WIFI_REMOTE_ENABLED 1
 #define CONFIG_ESP_IDF_VERSION "5.5"
+#define CONFIG_ESP_WIFI_REMOTE_IDF_SPECIFIC_ADDED 1
 #define CONFIG_SLAVE_IDF_TARGET_ESP32 1
 #define CONFIG_SLAVE_SOC_WIFI_SUPPORTED 1
 #define CONFIG_SLAVE_SOC_WIFI_WAPI_SUPPORT 1
diff --git a/components/esp_wifi_remote/idf_v5.5/include/injected/esp_wifi_types_generic.h b/components/esp_wifi_remote/idf_v5.5/include/injected/esp_wifi_types_generic.h
@@ -527,13 +527,13 @@ typedef struct {
     uint8_t password[64];                     /**< Password of soft-AP. */
     uint8_t ssid_len;                         /**< Optional length of SSID field. */
     uint8_t channel;                          /**< Channel of soft-AP */
-    wifi_auth_mode_t authmode;                /**< Auth mode of soft-AP. Do not support AUTH_WEP, AUTH_WAPI_PSK and AUTH_OWE in soft-AP mode. When the auth mode is set to WPA2_PSK, WPA2_WPA3_PSK or WPA3_PSK, the pairwise cipher will be overwritten with WIFI_CIPHER_TYPE_CCMP by default, unless explicitly set.  */
+    wifi_auth_mode_t authmode;                /**< Auth mode of soft-AP. Do not support AUTH_WEP, AUTH_WAPI_PSK and AUTH_OWE in soft-AP mode. When the auth mode is set to WPA2_PSK, WPA2_WPA3_PSK or WPA3_PSK, the pairwise cipher will be overwritten with WIFI_CIPHER_TYPE_CCMP.  */
     uint8_t ssid_hidden;                      /**< Broadcast SSID or not, default 0, broadcast the SSID */
     uint8_t max_connection;                   /**< Max number of stations allowed to connect in */
     uint16_t beacon_interval;                 /**< Beacon interval which should be multiples of 100. Unit: TU(time unit, 1 TU = 1024 us). Range: 100 ~ 60000. Default value: 100 */
     uint8_t csa_count;                        /**< Channel Switch Announcement Count. Notify the station that the channel will switch after the csa_count beacon intervals. Default value: 3 */
     uint8_t dtim_period;                      /**< Dtim period of soft-AP. Range: 1 ~ 10. Default value: 1 */
-    wifi_cipher_type_t pairwise_cipher;       /**< Pairwise cipher of SoftAP, group cipher will be derived using this. Cipher values are valid starting from WIFI_CIPHER_TYPE_TKIP, enum values before that will be considered as invalid and default cipher suites(TKIP+CCMP) will be used. Valid cipher suites in softAP mode are WIFI_CIPHER_TYPE_TKIP, WIFI_CIPHER_TYPE_CCMP, WIFI_CIPHER_TYPE_TKIP_CCMP, WIFI_CIPHER_TYPE_GCMP and WIFI_CIPHER_TYPE_GCMP256. */
+    wifi_cipher_type_t pairwise_cipher;       /**< Pairwise cipher of SoftAP, group cipher will be derived using this. Cipher values are valid starting from WIFI_CIPHER_TYPE_TKIP, enum values before that will be considered as invalid and default cipher suites(TKIP+CCMP) will be used. Valid cipher suites in softAP mode are WIFI_CIPHER_TYPE_TKIP, WIFI_CIPHER_TYPE_CCMP and WIFI_CIPHER_TYPE_TKIP_CCMP. */
     bool ftm_responder;                       /**< Enable FTM Responder mode */
     wifi_pmf_config_t pmf_cfg;                /**< Configuration for Protected Management Frame */
     wifi_sae_pwe_method_t sae_pwe_h2e;        /**< Configuration for SAE PWE derivation method */

Original file line number	Diff line number	Diff line change
`@@ -126,8 +126,3 @@ WEAK esp_err_t esp_eap_client_remote_set_domain_name(const char *domain_name)`
`126`	`126`	`{`
`127`	`127`	`LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);`
`128`	`128`	`}`
`129`		`-`
`130`		`-WEAK esp_err_t esp_eap_client_remote_set_eap_methods(esp_eap_method_t methods)`
`131`		`-{`
`132`		`- LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);`
`133`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -121,8 +121,3 @@ esp_err_t esp_eap_client_set_domain_name(const char *domain_name)`
`121`	`121`	`{`
`122`	`122`	`return esp_eap_client_remote_set_domain_name(domain_name);`
`123`	`123`	`}`
`124`		`-`
`125`		`-esp_err_t esp_eap_client_set_eap_methods(esp_eap_method_t methods)`
`126`		`-{`
`127`		`- return esp_eap_client_remote_set_eap_methods(methods);`
`128`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ esp_err_t esp_eap_client_remote_set_fast_params(esp_eap_fast_config config);`
`34`	`34`	`esp_err_t esp_eap_client_remote_use_default_cert_bundle(_Bool use_default_bundle);`
`35`	`35`	`void esp_wifi_remote_set_okc_support(_Bool enable);`
`36`	`36`	`esp_err_t esp_eap_client_remote_set_domain_name(const char *domain_name);`
`37`		`-esp_err_t esp_eap_client_remote_set_eap_methods(esp_eap_method_t methods);`
`38`	`37`
`39`	`38`	`#ifdef __cplusplus`
`40`	`39`	`}`