Merge branch 'bugfix/ndp_wait_events_issue' into 'master'

fix(esp_wifi): Fix false wait events during NAN datapath setup

Closes WIFIBUG-1170 and WIFIBUG-1171

See merge request espressif/esp-idf!39151

Author: Jiang Jiang Jian

components/esp_wifi/include/esp_private/wifi.h

@@ -39,6 +39,19 @@ typedef struct {
     void *storage;        /**< storage for FreeRTOS queue */
 } wifi_static_queue_t;
 
+struct nan_callbacks {
+    void (* service_match)(uint8_t sub_id, uint8_t pub_id, uint8_t pub_mac[6], uint16_t capab,
+                           uint8_t ssi_ver, uint8_t *ssi, uint16_t ssi_len);
+    void (* replied)(uint8_t pub_id, uint8_t sub_id, uint8_t pub_mac[6], uint8_t *ssi, uint16_t ssi_len);
+    void (* receive)(uint8_t svc_id, uint8_t peer_svc_id, uint8_t peer_mac[6], uint8_t *ssi, uint16_t ssi_len);
+    void (* ndp_indication)(uint8_t pub_id, uint8_t ndp_id, uint8_t peer_nmi[6], uint8_t peer_ndi[6],
+                            uint8_t *ssi, uint16_t ssi_len);
+    void (* ndp_confirm)(uint8_t status, uint8_t ndp_id, uint8_t peer_nmi[6], uint8_t peer_ndi[6],
+                         uint8_t own_ndi[6], uint8_t *ssi, uint16_t ssi_len);
+    void (* ndp_terminated)(uint8_t reason, uint8_t ndp_id, uint8_t init_ndi[6]);
+    void (* action_txdone)(uint32_t context, bool tx_status);
+};
+
 /**
   * @brief WiFi log level
   *
@@ -708,13 +721,14 @@ esp_err_t esp_nan_internal_subscribe_service(const wifi_nan_subscribe_cfg_t *sub
   *
   * @attention  This API should be called after WIFI_EVENT_NAN_SVC_MATCH event is received.
   *
-  * @param      fup_params  Configuration parameters for sending a Follow-up to the Peer.
+  * @param[in]  fup_params  Configuration parameters for sending a Follow-up to the Peer.
+  * @param[out] context Context returned for Follow-up frame to be matched in Tx done.
   *
   * @return
   *    - ESP_OK: succeed
   *    - others: failed
   */
-esp_err_t esp_nan_internal_send_followup(const wifi_nan_followup_params_t *fup_params);
+esp_err_t esp_nan_internal_send_followup(const wifi_nan_followup_params_t *fup_params, uint32_t *context);
 
 /**
   * @brief      Send Datapath Request to the Publisher with matching service
@@ -755,6 +769,19 @@ esp_err_t esp_nan_internal_datapath_resp(wifi_nan_datapath_resp_t *resp);
   */
 esp_err_t esp_nan_internal_datapath_end(wifi_nan_datapath_end_req_t *req);
 
+/**
+  * @brief      End NAN Datapath that is active
+  *
+  * @attention  This API should be called after receiving WIFI_EVENT_NDP_CONFIRM event.
+  *
+  * @param      req  NAN Datapath end request parameters.
+  *
+  * @return
+  *    - ESP_OK: succeed
+  *    - others: failed
+  */
+esp_err_t esp_nan_internal_register_callbacks(struct nan_callbacks *cb);
+
 /**
   * @brief     Connect WiFi station to the AP.
   *

components/esp_wifi/include/esp_wifi_types_generic.h

@@ -1366,7 +1366,7 @@ typedef struct {
     uint32_t reserved_2;        /**< Reserved */
     uint8_t ssi_version;        /**< Indicates version of SSI in Publish instance, 0 if not available */
     uint16_t ssi_len;           /**< Length of service specific info */
-    uint8_t *ssi;               /**< Service specific info of Publisher */
+    uint8_t ssi[];              /**< Service specific info of Publisher */
 } wifi_event_nan_svc_match_t;
 
 /**
@@ -1379,7 +1379,7 @@ typedef struct {
     uint32_t reserved_1;        /**< Reserved */
     uint32_t reserved_2;        /**< Reserved */
     uint16_t ssi_len;           /**< Length of service specific info */
-    uint8_t *ssi;               /**< Service specific info of Subscriber */
+    uint8_t ssi[];              /**< Service specific info of Subscriber */
 } wifi_event_nan_replied_t;
 
 /**
@@ -1392,7 +1392,7 @@ typedef struct {
     uint32_t reserved_1;                             /**< Reserved */
     uint32_t reserved_2;                             /**< Reserved */
     uint16_t ssi_len;                                /**< Length of service specific info */
-    uint8_t *ssi;                                    /**< Service specific info from Follow-up */
+    uint8_t ssi[];                                   /**< Service specific info from Follow-up */
 } wifi_event_nan_receive_t;
 
 /**
@@ -1406,7 +1406,7 @@ typedef struct {
     uint32_t reserved_1;                        /**< Reserved */
     uint32_t reserved_2;                        /**< Reserved */
     uint16_t ssi_len;                           /**< Length of service specific info */
-    uint8_t *ssi;                               /**< Service specific info from NDP/NDPE Attribute */
+    uint8_t ssi[];                              /**< Service specific info from NDP/NDPE Attribute */
 } wifi_event_ndp_indication_t;
 
 /**
@@ -1421,7 +1421,7 @@ typedef struct {
     uint32_t reserved_1;                        /**< Reserved */
     uint32_t reserved_2;                        /**< Reserved */
     uint16_t ssi_len;                           /**< Length of Service Specific Info */
-    uint8_t *ssi;                               /**< Service specific info from NDP/NDPE Attribute */
+    uint8_t ssi[];                              /**< Service specific info from NDP/NDPE Attribute */
 } wifi_event_ndp_confirm_t;
 
 /**