fix(v5.4): Per v5.4 docker image

Author: david-cermak

components/esp_wifi_remote/Kconfig

@@ -12,7 +12,7 @@ menu "Wi-Fi Remote"
         if ESP_IDF_VERSION>"5.3"
             orsource "./Kconfig.$IDF_VERSION.in"
         endif
-        if ESP_IDF_VERSION<="5.3"
+        if ESP_IDF_VERSION="5.3"
             rsource "./idf_v5.3/Kconfig.in"
         endif
 

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

@@ -522,7 +522,6 @@ config WIFI_RMT_WAPI_PSK
 config WIFI_RMT_SUITE_B_192
     bool "Enable NSA suite B support with 192 bit key"
     default n
-    depends on WIFI_RMT_ENTERPRISE_SUPPORT
     depends on SLAVE_SOC_WIFI_GCMP_SUPPORT
     select WIFI_RMT_GCMP_SUPPORT
     select WIFI_RMT_GMAC_SUPPORT

components/esp_wifi_remote/idf_v5.4/esp_wifi_remote_weak.c

@@ -435,13 +435,3 @@ WEAK esp_err_t esp_wifi_remote_get_bandwidths(wifi_interface_t ifx, wifi_bandwid
 {
     LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);
 }
-
-WEAK esp_err_t esp_wifi_remote_action_tx_req(wifi_action_tx_req_t *req)
-{
-    LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);
-}
-
-WEAK esp_err_t esp_wifi_remote_remain_on_channel(wifi_roc_req_t *req)
-{
-    LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);
-}

components/esp_wifi_remote/idf_v5.4/esp_wifi_with_remote.c

@@ -431,13 +431,3 @@ esp_err_t esp_wifi_get_bandwidths(wifi_interface_t ifx, wifi_bandwidths_t *bw)
 {
     return esp_wifi_remote_get_bandwidths(ifx, bw);
 }
-
-esp_err_t esp_wifi_action_tx_req(wifi_action_tx_req_t *req)
-{
-    return esp_wifi_remote_action_tx_req(req);
-}
-
-esp_err_t esp_wifi_remain_on_channel(wifi_roc_req_t *req)
-{
-    return esp_wifi_remote_remain_on_channel(req);
-}

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

@@ -95,8 +95,6 @@ esp_err_t esp_wifi_remote_set_protocols(wifi_interface_t ifx, wifi_protocols_t *
 esp_err_t esp_wifi_remote_get_protocols(wifi_interface_t ifx, wifi_protocols_t *protocols);
 esp_err_t esp_wifi_remote_set_bandwidths(wifi_interface_t ifx, wifi_bandwidths_t *bw);
 esp_err_t esp_wifi_remote_get_bandwidths(wifi_interface_t ifx, wifi_bandwidths_t *bw);
-esp_err_t esp_wifi_remote_action_tx_req(wifi_action_tx_req_t *req);
-esp_err_t esp_wifi_remote_remain_on_channel(wifi_roc_req_t *req);
 
 #ifdef __cplusplus
 }

components/esp_wifi_remote/idf_v5.4/include/injected/esp_wifi.h

@@ -989,7 +989,6 @@ esp_err_t esp_wifi_get_promiscuous_ctrl_filter(wifi_promiscuous_filter_t *filter
   *    - ESP_ERR_WIFI_MODE: invalid mode
   *    - ESP_ERR_WIFI_PASSWORD: invalid password
   *    - ESP_ERR_WIFI_NVS: WiFi internal NVS error
-  *    - ESP_ERR_WIFI_STATE: WiFi still connecting when invoke esp_wifi_set_config
   *    - others: refer to the error code in esp_err.h
   */
 esp_err_t esp_wifi_set_config(wifi_interface_t interface, wifi_config_t *conf);
@@ -1790,29 +1789,6 @@ esp_err_t esp_wifi_set_bandwidths(wifi_interface_t ifx, wifi_bandwidths_t* bw);
   */
 esp_err_t esp_wifi_get_bandwidths(wifi_interface_t ifx, wifi_bandwidths_t *bw);
 
-/**
-  * @brief      Send action frame on target channel
-  *
-  * @param    req   action tx request structure containing relevant fields
-  *
-  * @return
-  *    - ESP_OK: succeed
-  *    - ESP_ERR_NO_MEM: failed to allocate memory
-  *    - ESP_FAIL: failed to send frame
-  */
-esp_err_t esp_wifi_action_tx_req(wifi_action_tx_req_t *req);
-
-/**
-  * @brief      Remain on the target channel for required duration
-  *
-  * @param    req  roc request structure containing relevant fields
-  *
-  * @return
-  *    - ESP_OK: succeed
-  *    - ESP_ERR_NO_MEM: failed to allocate memory
-  *    - ESP_FAIL: failed to perform roc operation
-  */
-esp_err_t esp_wifi_remain_on_channel(wifi_roc_req_t * req);
 #ifdef __cplusplus
 }
 #endif

components/esp_wifi_remote/idf_v5.4/include/injected/esp_wifi_types_generic.h

@@ -41,15 +41,12 @@ typedef enum {
     WIFI_IF_MAX                       /**< Maximum number of interfaces */
 } wifi_interface_t;
 
-typedef enum {
-    WIFI_OFFCHAN_TX_CANCEL,   /**< Cancel off-channel transmission */
-    WIFI_OFFCHAN_TX_REQ,      /**< Request off-channel transmission */
-} wifi_action_tx_t;
+#define WIFI_OFFCHAN_TX_REQ      1    /**< Request off-channel transmission */
+#define WIFI_OFFCHAN_TX_CANCEL   0    /**< Cancel off-channel transmission */
+
+#define WIFI_ROC_REQ     1    /**< Request remain on channel */
+#define WIFI_ROC_CANCEL  0    /**< Cancel remain on channel */
 
-typedef enum {
-    WIFI_ROC_CANCEL,    /**< Cancel remain on channel */
-    WIFI_ROC_REQ,       /**< Request remain on channel */
-} wifi_roc_t;
 /**
   * @brief Wi-Fi country policy
   */
@@ -244,7 +241,6 @@ typedef struct {
     wifi_scan_channel_bitmap_t channel_bitmap;         /**< Channel bitmap for setting specific channels to be scanned.
                                                             Please note that the 'channel' parameter above needs to be set to 0 to allow scanning by bitmap.
                                                             Also, note that only allowed channels configured by wifi_country_t can be scanned. */
-    bool coex_background_scan;                         /**< Enable it to scan return home channel under coexist */
 } wifi_scan_config_t;
 
 /**
@@ -567,7 +563,7 @@ typedef struct {
     uint32_t he_trig_mu_bmforming_partial_feedback_disabled: 1;   /**< Whether to disable support the transmission of partial-bandwidth MU feedback in an HE TB sounding sequence. */
     uint32_t he_trig_cqi_feedback_disabled: 1;                    /**< Whether to disable support the transmission of CQI feedback in an HE TB sounding sequence. */
     uint32_t he_reserved: 22;                                     /**< Reserved for future feature set */
-    uint8_t sae_h2e_identifier[SAE_H2E_IDENTIFIER_LEN];           /**< Password identifier for H2E. Strings null-terminated (length < SAE_H2E_IDENTIFIER_LEN) or non-null terminated (length = SAE_H2E_IDENTIFIER_LEN) are accepted. Non-null terminated string with 0xFF for full length of SAE_H2E_IDENTIFIER_LEN is not considered a valid identifier */
+    uint8_t sae_h2e_identifier[SAE_H2E_IDENTIFIER_LEN];           /**< Password identifier for H2E. this needs to be null terminated string */
 } wifi_sta_config_t;
 
 /**
@@ -777,49 +773,12 @@ typedef int (* wifi_action_rx_cb_t)(uint8_t *hdr, uint8_t *payload,
 typedef struct {
     wifi_interface_t ifx;       /**< Wi-Fi interface to send request to */
     uint8_t dest_mac[6];        /**< Destination MAC address */
-    wifi_action_tx_t type;      /**< ACTION TX operation type */
-    uint8_t channel;            /**< Channel on which to perform ACTION TX Operation */
-    uint32_t wait_time_ms;      /**< Duration to wait for on target channel */
     bool no_ack;                /**< Indicates no ack required */
-    wifi_action_rx_cb_t rx_cb;  /**< Rx Callback to receive action frames */
-    uint8_t op_id;              /**< Unique Identifier for operation provided by wifi driver */
+    wifi_action_rx_cb_t rx_cb;  /**< Rx Callback to receive any response */
     uint32_t data_len;          /**< Length of the appended Data */
     uint8_t data[0];            /**< Appended Data payload */
 } wifi_action_tx_req_t;
 
-/** Status codes for WIFI_EVENT_ROC_DONE evt */
-typedef enum {
-    WIFI_ROC_DONE = 0,         /**< ROC operation was completed successfully */
-    WIFI_ROC_FAIL,             /**< ROC operation was cancelled */
-} wifi_roc_done_status_t;
-
-/**
-  * @brief     The callback function executed when ROC operation has ended
-  *
-  * @param     context rxcb registered for the corresponding ROC operation
-  * @param     op_id  ID of the corresponding ROC operation
-  * @param     status status code of the ROC operation denoted
-  *
-  */
-typedef void (* wifi_action_roc_done_cb_t)(uint32_t context, uint8_t op_id,
-                                           wifi_roc_done_status_t status);
-
-/**
- * @brief Remain on Channel request
- *
- *
- */
-typedef struct {
-    wifi_interface_t ifx;              /**< WiFi interface to send request to */
-    wifi_roc_t type;                   /**< ROC operation type */
-    uint8_t channel;                   /**< Channel on which to perform ROC Operation */
-    wifi_second_chan_t sec_channel;    /**< Secondary channel */
-    uint32_t wait_time_ms;             /**< Duration to wait for on target channel */
-    wifi_action_rx_cb_t rx_cb;         /**< Rx Callback to receive any response */
-    uint8_t op_id;                     /**< ID of this specific ROC operation provided by wifi driver */
-    wifi_action_roc_done_cb_t done_cb; /**< Callback to function that will be called upon ROC done. If assigned, WIFI_EVENT_ROC_DONE event will not be posted */
-} wifi_roc_req_t;
-
 /**
   * @brief FTM Initiator configuration
   *
@@ -1277,32 +1236,21 @@ typedef struct {
 #define WIFI_STATIS_PS        (1<<4)    /**< Power save status */
 #define WIFI_STATIS_ALL       (-1)      /**< All status */
 
-/** Status codes for WIFI_EVENT_ACTION_TX_STATUS evt */
-/** There will be back to back events in success case TX_DONE and TX_DURATION_COMPLETED */
-typedef enum {
-    WIFI_ACTION_TX_DONE = 0,           /**< ACTION_TX operation was completed successfully */
-    WIFI_ACTION_TX_FAILED,             /**< ACTION_TX operation failed during tx */
-    WIFI_ACTION_TX_DURATION_COMPLETED, /**< ACTION_TX operation completed it's wait duration */
-    WIFI_ACTION_TX_OP_CANCELLED,       /**< ACTION_TX operation was cancelled by application or higher priority operation */
-} wifi_action_tx_status_type_t;
-
-/** Argument structure for WIFI_EVENT_ACTION_TX_STATUS event */
+/**
+  * @brief Argument structure for WIFI_EVENT_ACTION_TX_STATUS event
+  */
 typedef struct {
-    wifi_interface_t ifx;                   /**< WiFi interface to send request to */
-    uint32_t context;                       /**< Context to identify the request */
-    wifi_action_tx_status_type_t status;    /**< Status of the operation */
-    uint8_t op_id;                          /**< ID of the corresponding operation that was provided during action tx request */
-    uint8_t channel;                        /**< Channel provided in tx request */
+    wifi_interface_t ifx;     /**< Wi-Fi interface to send request to */
+    uint32_t context;         /**< Context to identify the request */
+    uint8_t da[6];            /**< Destination MAC address */
+    uint8_t status;           /**< Status of the operation */
 } wifi_event_action_tx_status_t;
 
 /**
   * @brief Argument structure for WIFI_EVENT_ROC_DONE event
   */
 typedef struct {
-    uint32_t context;               /**< Context to identify the initiator of the request */
-    wifi_roc_done_status_t status;  /**< ROC status */
-    uint8_t op_id;                  /**< ID of the corresponding ROC operation */
-    uint8_t channel;                /**< Channel provided in tx request */
+    uint32_t context;         /**< Context to identify the request */
 } wifi_event_roc_done_t;
 
 /**

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

@@ -431,13 +431,3 @@ esp_err_t esp_wifi_remote_get_bandwidths(wifi_interface_t ifx, wifi_bandwidths_t
 {
     return ESP_OK;
 }
-
-esp_err_t esp_wifi_remote_action_tx_req(wifi_action_tx_req_t *req)
-{
-    return ESP_OK;
-}
-
-esp_err_t esp_wifi_remote_remain_on_channel(wifi_roc_req_t *req)
-{
-    return ESP_OK;
-}

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

@@ -90,5 +90,3 @@ esp_err_t esp_wifi_remote_set_protocols(wifi_interface_t ifx, wifi_protocols_t *
 esp_err_t esp_wifi_remote_get_protocols(wifi_interface_t ifx, wifi_protocols_t *protocols);
 esp_err_t esp_wifi_remote_set_bandwidths(wifi_interface_t ifx, wifi_bandwidths_t *bw);
 esp_err_t esp_wifi_remote_get_bandwidths(wifi_interface_t ifx, wifi_bandwidths_t *bw);
-esp_err_t esp_wifi_remote_action_tx_req(wifi_action_tx_req_t *req);
-esp_err_t esp_wifi_remote_remain_on_channel(wifi_roc_req_t *req);

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

@@ -453,14 +453,4 @@ void run_all_wifi_apis(void)
         esp_wifi_get_bandwidths(ifx, bw);
     }
 
-    {
-        wifi_action_tx_req_t *req = NULL;
-        esp_wifi_action_tx_req(req);
-    }
-
-    {
-        wifi_roc_req_t *req = NULL;
-        esp_wifi_remain_on_channel(req);
-    }
-
 }