fix(wifi_remote): Update per v5.4 espressif/esp-idf@318ad17991f

Author: david-cermak

components/esp_wifi_remote/idf_v5.4/Kconfig.wifi.in

@@ -533,20 +533,38 @@
             default n
             help
                 Select this option to enable 802.11k 802.11v APIs(RRM and BTM support).
+
+        config ESP_WIFI_RRM_SUPPORT
+            bool "Enable 802.11k APIs Support"
+            depends on ESP_WIFI_11KV_SUPPORT
+            default n
+            help
+                Select this option to enable 802.11k APIs(RRM support).
                 Only APIs which are helpful for network assisted roaming
                 are supported for now.
-                Enable this option with BTM and RRM enabled in sta config
+                Enable this option with RRM enabled in sta config
                 to make device ready for network assisted roaming.
-                BTM: BSS transition management enables an AP to request a station to transition
-                to a specific AP, or to indicate to a station a set of preferred APs.
                 RRM: Radio measurements enable STAs to understand the radio environment,
                 it enables STAs to observe and gather data on radio link performance
                 and on the radio environment. Current implementation adds beacon report,
                 link measurement, neighbor report.
 
+        config ESP_WIFI_WNM_SUPPORT
+            bool "Enable 802.11v APIs Support"
+            depends on ESP_WIFI_11KV_SUPPORT
+            default n
+            help
+                Select this option to enable 802.11v APIs(BTM support).
+                Only APIs which are helpful for network assisted roaming
+                are supported for now.
+                Enable this option with BTM enabled in sta config
+                to make device ready for network assisted roaming.
+                BTM: BSS transition management enables an AP to request a station to transition
+                to a specific AP, or to indicate to a station a set of preferred APs.
+
         config ESP_WIFI_SCAN_CACHE
             bool "Keep scan results in cache"
-            depends on ESP_WIFI_11KV_SUPPORT
+            depends on ESP_WIFI_RRM_SUPPORT
             default n
             help
                 Keep scan results in cache, if not enabled, those
@@ -556,6 +574,8 @@
             bool "Enable Multi Band Operation Certification Support"
             default n
             select ESP_WIFI_11KV_SUPPORT
+            select ESP_WIFI_RRM_SUPPORT
+            select ESP_WIFI_WNM_SUPPORT
             select ESP_WIFI_SCAN_CACHE
             help
                 Select this option to enable WiFi Multiband operation certification support.

components/esp_wifi_remote/idf_v5.4/esp_wifi_remote_weak.c

@@ -366,6 +366,11 @@ WEAK esp_err_t esp_wifi_remote_config_80211_tx_rate(wifi_interface_t ifx, wifi_p
     LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);
 }
 
+WEAK esp_err_t esp_wifi_remote_config_80211_tx(wifi_interface_t ifx, wifi_tx_rate_config_t *config)
+{
+    LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);
+}
+
 WEAK esp_err_t esp_wifi_remote_disable_pmf_config(wifi_interface_t ifx)
 {
     LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);

components/esp_wifi_remote/idf_v5.4/esp_wifi_with_remote.c

@@ -362,6 +362,11 @@ esp_err_t esp_wifi_config_80211_tx_rate(wifi_interface_t ifx, wifi_phy_rate_t ra
     return esp_wifi_remote_config_80211_tx_rate(ifx, rate);
 }
 
+esp_err_t esp_wifi_config_80211_tx(wifi_interface_t ifx, wifi_tx_rate_config_t *config)
+{
+    return esp_wifi_remote_config_80211_tx(ifx, config);
+}
+
 esp_err_t esp_wifi_disable_pmf_config(wifi_interface_t ifx)
 {
     return esp_wifi_remote_disable_pmf_config(ifx);

components/esp_wifi_remote/idf_v5.4/include/esp_wifi_remote_api.h

@@ -76,6 +76,7 @@ esp_err_t esp_wifi_remote_force_wakeup_release(void);
 esp_err_t esp_wifi_remote_set_country_code(const char *country, _Bool ieee80211d_enabled);
 esp_err_t esp_wifi_remote_get_country_code(char *country);
 esp_err_t esp_wifi_remote_config_80211_tx_rate(wifi_interface_t ifx, wifi_phy_rate_t rate);
+esp_err_t esp_wifi_remote_config_80211_tx(wifi_interface_t ifx, wifi_tx_rate_config_t *config);
 esp_err_t esp_wifi_remote_disable_pmf_config(wifi_interface_t ifx);
 esp_err_t esp_wifi_remote_sta_get_aid(uint16_t *aid);
 esp_err_t esp_wifi_remote_sta_get_negotiated_phymode(wifi_phy_mode_t *phymode);

components/esp_wifi_remote/test/smoke_test/components/esp_hosted/idf_v5.4/esp_hosted_mock.c

@@ -362,6 +362,11 @@ esp_err_t esp_wifi_remote_config_80211_tx_rate(wifi_interface_t ifx, wifi_phy_ra
     return ESP_OK;
 }
 
+esp_err_t esp_wifi_remote_config_80211_tx(wifi_interface_t ifx, wifi_tx_rate_config_t *config)
+{
+    return ESP_OK;
+}
+
 esp_err_t esp_wifi_remote_disable_pmf_config(wifi_interface_t ifx)
 {
     return ESP_OK;

components/esp_wifi_remote/test/smoke_test/components/esp_hosted/idf_v5.4/include/esp_hosted_mock.h

@@ -76,6 +76,7 @@ esp_err_t esp_wifi_remote_force_wakeup_release(void);
 esp_err_t esp_wifi_remote_set_country_code(const char *country, _Bool ieee80211d_enabled);
 esp_err_t esp_wifi_remote_get_country_code(char *country);
 esp_err_t esp_wifi_remote_config_80211_tx_rate(wifi_interface_t ifx, wifi_phy_rate_t rate);
+esp_err_t esp_wifi_remote_config_80211_tx(wifi_interface_t ifx, wifi_tx_rate_config_t *config);
 esp_err_t esp_wifi_remote_disable_pmf_config(wifi_interface_t ifx);
 esp_err_t esp_wifi_remote_sta_get_aid(uint16_t *aid);
 esp_err_t esp_wifi_remote_sta_get_negotiated_phymode(wifi_phy_mode_t *phymode);

components/esp_wifi_remote/test/smoke_test/main/idf_v5.4/all_wifi_calls.c

@@ -378,6 +378,12 @@ void run_all_wifi_apis(void)
         esp_wifi_config_80211_tx_rate(ifx, rate);
     }
 
+    {
+        wifi_interface_t ifx = 0;
+        wifi_tx_rate_config_t *config = NULL;
+        esp_wifi_config_80211_tx(ifx, config);
+    }
+
     {
         wifi_interface_t ifx = 0;
         esp_wifi_disable_pmf_config(ifx);

components/esp_wifi_remote/test/smoke_test/main/idf_v5.4/all_wifi_remote_calls.c

@@ -378,6 +378,12 @@ void run_all_wifi_remote_apis(void)
         esp_wifi_remote_config_80211_tx_rate(ifx, rate);
     }
 
+    {
+        wifi_interface_t ifx = 0;
+        wifi_tx_rate_config_t *config = NULL;
+        esp_wifi_remote_config_80211_tx(ifx, config);
+    }
+
     {
         wifi_interface_t ifx = 0;
         esp_wifi_remote_disable_pmf_config(ifx);