Merge branch 'fix/backport_wifi_fixes_v5.3' into 'release/v5.3'

fix(esp_wifi): backport some wifi fixes to v5.3

See merge request espressif/esp-idf!30933

Author: jack0c

components/esp_rom/esp32c2/ld/esp32c2.rom.ld

@@ -1655,7 +1655,7 @@ hal_sniffer_enable = 0x40001eec;
 hal_sniffer_disable = 0x40001ef0;
 /*hal_sniffer_rx_set_promis = 0x40001ef4;*/
 hal_sniffer_rx_clr_statistics = 0x40001ef8;
-hal_sniffer_set_promis_misc_pkt = 0x40001efc;
+/*hal_sniffer_set_promis_misc_pkt = 0x40001efc;*/
 tsf_hal_set_tsf_enable = 0x40001f00;
 tsf_hal_set_tsf_disable = 0x40001f04;
 tsf_hal_is_tsf_enabled = 0x40001f08;
@@ -1849,7 +1849,7 @@ ieee80211_alloc_tx_buf = 0x40002108;
 /* ieee80211_send_nulldata = 0x40002110; */
 /* ieee80211_setup_robust_mgmtframe = 0x40002114; */
 ieee80211_encap_null_data = 0x4000211c;
-ieee80211_send_deauth = 0x40002120;
+ieee80211_send_deauth_no_bss = 0x40002120;
 ieee80211_alloc_deauth = 0x40002124;
 ieee80211_send_proberesp = 0x40002128;
 ieee80211_getcapinfo = 0x40002130;

components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld

@@ -31,7 +31,7 @@ rcUpdateTxDone = 0x4000177c;
 wDevCheckBlockError = 0x400017b4;
 /* wDev_IndicateFrame = 0x400017c8;*/
 wDev_ProcessFiq = 0x400017f0;
-wDev_ProcessRxSucData = 0x400017f4;
+/*wDev_ProcessRxSucData = 0x400017f4;*/
 /*ppProcTxDone = 0x40001804;*/
 pm_tx_data_done_process = 0x40001808;
 ppMapWaitTxq = 0x40001810;

components/esp_rom/esp32c5/mp/esp32c5/ld/esp32c5.rom.pp.ld

@@ -74,7 +74,7 @@ lmacReachLongLimit = 0x40000cb8;
 lmacReachShortLimit = 0x40000cbc;
 lmacRecycleMPDU = 0x40000cc0;
 lmacRxDone = 0x40000cc4;
-lmacSetTxFrame = 0x40000cc8;
+/*lmacSetTxFrame = 0x40000cc8;*/
 lmacTxDone = 0x40000ccc;
 lmacTxFrame = 0x40000cd0;
 lmacDisableTransmit = 0x40000cd4;

components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld

@@ -48,7 +48,7 @@ lmacReachLongLimit = 0x40000b60;
 lmacReachShortLimit = 0x40000b64;
 lmacRecycleMPDU = 0x40000b68;
 lmacRxDone = 0x40000b6c;
-lmacSetTxFrame = 0x40000b70;
+/*lmacSetTxFrame = 0x40000b70;*/
 lmacTxDone = 0x40000b74;
 lmacTxFrame = 0x40000b78;
 mac_tx_set_duration = 0x40000b7c;

components/esp_wifi/include/esp_mesh.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2017-2023 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2017-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -141,7 +141,7 @@ extern "C" {
 #define MESH_ASSOC_FLAG_STA_VOTED           (0x04)     /**< station vote done, set when connect to router */
 #define MESH_ASSOC_FLAG_NETWORK_FREE        (0x08)     /**< no root in current network */
 #define MESH_ASSOC_FLAG_STA_VOTE_EXPIRE     (0x10)     /**< the voted address is expired, means the voted device lose the chance to be root */
-#define MESH_ASSOC_FLAG_ROOTS_FOUND         (0x20)     /**< roots conflict is found, means that thre are at least two roots in the mesh network */
+#define MESH_ASSOC_FLAG_ROOTS_FOUND         (0x20)     /**< roots conflict is found, means that there are at least two roots in the mesh network */
 #define MESH_ASSOC_FLAG_ROOT_FIXED          (0x40)     /**< the root is fixed in the mesh network */
 
 /**
@@ -216,7 +216,7 @@ typedef enum {
     MESH_ROOT,    /**< the only sink of the mesh network. Has the ability to access external IP network */
     MESH_NODE,    /**< intermediate device. Has the ability to forward packets over the mesh network */
     MESH_LEAF,    /**< has no forwarding ability */
-    MESH_STA,     /**< connect to router with a standlone Wi-Fi station mode, no network expansion capability */
+    MESH_STA,     /**< connect to router with a standalone Wi-Fi station mode, no network expansion capability */
 } mesh_type_t;
 
 /**
@@ -642,14 +642,16 @@ esp_err_t esp_mesh_stop(void);
  *             - Field size should not exceed MESH_MPS. Note that the size of one mesh packet should not exceed MESH_MTU.
  *             - Field proto should be set to data protocol in use (default is MESH_PROTO_BIN for binary).
  *             - Field tos should be set to transmission tos (type of service) in use (default is MESH_TOS_P2P for point-to-point reliable).
+ *               - If the packet is to the root, MESH_TOS_P2P must be set to ensure reliable transmission.
+ *               - As long as the MESH_TOS_P2P is set, the API is blocking, even if the flag is set with MESH_DATA_NONBLOCK.
+ *               - As long as the MESH_TOS_DEF is set, the API is non-blocking.
  * @param[in]  flag  bitmap for data sent
+ *             - Flag is at least one of the three MESH_DATA_P2P/MESH_DATA_FROMDS/MESH_DATA_TODS, which represents the direction of packet sending.
  *             -  Speed up the route search
- *               - If the packet is to the root and "to" parameter is NULL, set this parameter to 0.
  *               - If the packet is to an internal device, MESH_DATA_P2P should be set.
  *               - If the packet is to the root ("to" parameter isn't NULL) or to external IP network, MESH_DATA_TODS should be set.
  *               - If the packet is from the root to an internal device, MESH_DATA_FROMDS should be set.
- *             - Specify whether this API is block or non-block, block by default
- *               - If needs non-blocking, MESH_DATA_NONBLOCK should be set. Otherwise, may use esp_mesh_send_block_time() to specify a blocking time.
+ *             - Specify whether this API is blocking or non-blocking, blocking by default.
  *             - In the situation of the root change, MESH_DATA_DROP identifies this packet can be dropped by the new root
  *               for upstream data to external IP network, we try our best to avoid data loss caused by the root change, but
  *               there is a risk that the new root is running out of memory because most of memory is occupied by the pending data which
@@ -684,6 +686,7 @@ esp_err_t esp_mesh_send(const mesh_addr_t *to, const mesh_data_t *data,
                         int flag, const mesh_opt_t opt[],  int opt_count);
 /**
  * @brief      Set blocking time of esp_mesh_send()
+ *             - Suggest to set the blocking time to at least 5s when the environment is poor. Otherwise, esp_mesh_send() may timeout frequently.
  *
  * @attention  This API shall be called before mesh is started.
  *
@@ -1202,6 +1205,7 @@ int esp_mesh_get_xon_qsize(void);
 
 /**
  * @brief      Set whether allow more than one root existing in one network
+ *             - The default value is true, that is, multiple roots are allowed.
  *
  * @param[in]  allowed  allow or not
  *

components/esp_wifi/include/esp_wifi_he_types.h

@@ -302,9 +302,18 @@ typedef struct {
     uint64_t target_wake_time;            /**< TWT SP start time */
 } wifi_event_sta_itwt_setup_t;
 
+/**
+  * @brief iTWT teardown status
+  */
+typedef enum {
+    ITWT_TEARDOWN_FAIL,               /**< station sends teardown frame fail */
+    ITWT_TEARDOWN_SUCCESS,            /**< 1) station successfully sends teardown frame to AP; 2) station receives teardown frame from AP */
+} wifi_itwt_teardown_status_t;
+
 /** Argument structure for WIFI_EVENT_TWT_TEARDOWN event */
 typedef struct {
     uint8_t flow_id;                     /**< flow id */
+    wifi_itwt_teardown_status_t status;  /**< itwt teardown status */
 } wifi_event_sta_itwt_teardown_t;
 
 /**

components/esp_wifi/include/esp_wifi_types_generic.h

@@ -903,7 +903,7 @@ typedef struct {
     uint8_t mac[6];           /**< MAC address of the station disconnects to soft-AP */
     uint8_t aid;              /**< the aid that soft-AP gave to the station disconnects to  */
     bool is_mesh_child;       /**< flag to identify mesh child */
-    uint8_t reason;           /**< reason of disconnection */
+    uint16_t reason;           /**< reason of disconnection */
 } wifi_event_ap_stadisconnected_t;
 
 /** Argument structure for WIFI_EVENT_AP_PROBEREQRECVED event */

components/esp_wifi/lib

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -28,12 +28,13 @@
 #define NDP_REJECTED        BIT5
 
 /* Macros */
-#define MACADDR_LEN 6
+#define MACADDR_LEN             6
 #define MACADDR_EQUAL(a1, a2)   (memcmp(a1, a2, MACADDR_LEN))
 #define MACADDR_COPY(dst, src)  (memcpy(dst, src, MACADDR_LEN))
-#define NAN_DW_INTVL_MS 524     /* NAN DW interval (512 TU's ~= 524 mSec) */
-#define NAN_NDP_RESP_TIMEOUT_DW 4
+#define NAN_DW_INTVL_MS         524     /* NAN DW interval (512 TU's ~= 524 mSec) */
+#define NAN_NDP_RESP_TIMEOUT_DW 8
 #define NAN_NDP_RESP_TIMEOUT    NAN_NDP_RESP_TIMEOUT_DW*NAN_DW_INTVL_MS
+#define NAN_NDP_TERM_TIMEOUT    2*NAN_DW_INTVL_MS /* NDP Termination Timeout - 2 DW*/
 
 /* Global Variables */
 static const char *TAG = "nan_app";
@@ -800,7 +801,7 @@ esp_err_t esp_wifi_nan_stop(void)
 
         NAN_DATA_UNLOCK();
         os_event_group_clear_bits(nan_event_group, NDP_TERMINATED);
-        os_event_group_wait_bits(nan_event_group, NDP_TERMINATED, pdFALSE, pdFALSE, portMAX_DELAY);
+        os_event_group_wait_bits(nan_event_group, NDP_TERMINATED, pdFALSE, pdFALSE, pdMS_TO_TICKS(NAN_NDP_TERM_TIMEOUT));
         os_event_group_clear_bits(nan_event_group, NDP_TERMINATED);
         /* Wait for 1 NAN DW interval (512 TU's ~= 524 mSec) for successful termination */
         g_wifi_osi_funcs._task_delay(NAN_DW_INTVL_MS/portTICK_PERIOD_MS);

components/esp_wifi/wifi_apps/nan_app/src/nan_app.c

@@ -246,7 +246,7 @@ static void wifi_event_handler(void* arg, esp_event_base_t event_base,
     }
     case WIFI_EVENT_AP_STADISCONNECTED: {
         wifi_event_ap_stadisconnected_t* event = (wifi_event_ap_stadisconnected_t*) event_data;
-        BLUFI_INFO("station "MACSTR" leave, AID=%d", MAC2STR(event->mac), event->aid);
+        BLUFI_INFO("station "MACSTR" leave, AID=%d, reason=%d", MAC2STR(event->mac), event->aid, event->reason);
         break;
     }