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

Jiang Jiang Jian · Jiang Jiang Jian · commit 69bd12d792c0 · 2025-02-19T21:59:20.000+08:00
fix(wifi): backport some fixes to v5.4

See merge request espressif/esp-idf!37008
diff --git a/components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld b/components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld
@@ -122,7 +122,7 @@ pm_local_tsf_process = 0x40000cd4;
 pm_set_beacon_filter = 0x40000cd8;
 pm_is_in_wifi_slice_threshold = 0x40000cdc;
 pm_is_waked = 0x40000ce0;
-pm_keep_alive = 0x40000ce4;
+//pm_keep_alive = 0x40000ce4;
 pm_on_beacon_rx = 0x40000ce8;
 pm_on_data_rx = 0x40000cec;
 pm_on_data_tx = 0x40000cf0;
diff --git a/components/esp_wifi/include/esp_wifi.h b/components/esp_wifi/include/esp_wifi.h
@@ -583,7 +583,7 @@ esp_err_t esp_wifi_scan_stop(void);
 esp_err_t esp_wifi_scan_get_ap_num(uint16_t *number);
 
 /**
-  * @brief     Get AP list found in last scan.
+  * @brief     Retrieve the list of APs found during the last scan. The returned AP list is sorted in descending order based on RSSI.
   *
   * @attention  This API will free all memory occupied by scanned AP list.
   *
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit dfbd8b0145a604bcd4c0b57feff18cd1e62197cb
+Subproject commit e56388eff4b6e39db9125b399bfb6c5a165f9ed4
diff --git a/components/soc/esp32c5/include/soc/Kconfig.soc_caps.in b/components/soc/esp32c5/include/soc/Kconfig.soc_caps.in
@@ -1491,6 +1491,10 @@ config SOC_WIFI_MAC_VERSION_NUM
     int
     default 3
 
+config SOC_WIFI_NAN_SUPPORT
+    bool
+    default y
+
 config SOC_BLE_SUPPORTED
     bool
     default y
diff --git a/components/soc/esp32c5/include/soc/soc_caps.h b/components/soc/esp32c5/include/soc/soc_caps.h
@@ -616,6 +616,7 @@
 #define SOC_WIFI_HE_SUPPORT                 (1)    /*!< Support Wi-Fi 6 */
 #define SOC_WIFI_SUPPORT_5G                 (1)    /*!< Support 5G */
 #define SOC_WIFI_MAC_VERSION_NUM            (3)    /*!< Wi-Fi MAC version num is 3 */
+#define SOC_WIFI_NAN_SUPPORT                (1)    /*!< Support WIFI Aware (NAN) */
 
 /*---------------------------------- Bluetooth CAPS ----------------------------------*/
 #define SOC_BLE_SUPPORTED                   (1)    /*!< Support Bluetooth Low Energy hardware */
diff --git a/components/soc/esp32c61/include/soc/Kconfig.soc_caps.in b/components/soc/esp32c61/include/soc/Kconfig.soc_caps.in
@@ -1071,6 +1071,10 @@ config SOC_WIFI_MAC_VERSION_NUM
     int
     default 3
 
+config SOC_WIFI_NAN_SUPPORT
+    bool
+    default y
+
 config SOC_BLE_SUPPORTED
     bool
     default y
diff --git a/components/soc/esp32c61/include/soc/soc_caps.h b/components/soc/esp32c61/include/soc/soc_caps.h
@@ -482,6 +482,7 @@
 #define SOC_WIFI_MESH_SUPPORT               (1)    /*!< Support WIFI MESH */
 #define SOC_WIFI_HE_SUPPORT                 (1)    /*!< Support Wi-Fi 6 */
 #define SOC_WIFI_MAC_VERSION_NUM            (3)    /*!< Wi-Fi MAC version num is 3 */
+#define SOC_WIFI_NAN_SUPPORT                (1)    /*!< Support WIFI Aware (NAN) */
 
 /*---------------------------------- Bluetooth CAPS ----------------------------------*/
 #define SOC_BLE_SUPPORTED                   (1)    /*!< Support Bluetooth Low Energy hardware */
diff --git a/examples/wifi/iperf/main/idf_component.yml b/examples/wifi/iperf/main/idf_component.yml
@@ -8,6 +8,6 @@ dependencies:
   esp-qa/ping-cmd:
     version: "~1.0.0"
   espressif/esp-extconn:
-    version: "~0.1.0"
+    version: "~0.2.0"
     rules:
       - if: "target in [esp32p4]"
diff --git a/examples/wifi/wifi_aware/nan_console/README.md b/examples/wifi/wifi_aware/nan_console/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-S2 |
-| ----------------- | ----- | -------- |
+| Supported Targets | ESP32 | ESP32-C5 | ESP32-C61 | ESP32-S2 |
+| ----------------- | ----- | -------- | --------- | -------- |
 
 # NAN Console Example
 
diff --git a/examples/wifi/wifi_aware/nan_publisher/README.md b/examples/wifi/wifi_aware/nan_publisher/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-S2 |
-| ----------------- | ----- | -------- |
+| Supported Targets | ESP32 | ESP32-C5 | ESP32-C61 | ESP32-S2 |
+| ----------------- | ----- | -------- | --------- | -------- |
 
 # NAN Publisher Example
 
diff --git a/examples/wifi/wifi_aware/nan_subscriber/README.md b/examples/wifi/wifi_aware/nan_subscriber/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-S2 |
-| ----------------- | ----- | -------- |
+| Supported Targets | ESP32 | ESP32-C5 | ESP32-C61 | ESP32-S2 |
+| ----------------- | ----- | -------- | --------- | -------- |
 
 # NAN Subscriber Example
 

Original file line number	Diff line number	Diff line change
`@@ -583,7 +583,7 @@ esp_err_t esp_wifi_scan_stop(void);`
`583`	`583`	`esp_err_t esp_wifi_scan_get_ap_num(uint16_t *number);`
`584`	`584`
`585`	`585`	`/**`
`586`		`- * @brief Get AP list found in last scan.`
	`586`	`+ * @brief Retrieve the list of APs found during the last scan. The returned AP list is sorted in descending order based on RSSI.`
`587`	`587`	`*`
`588`	`588`	`* @attention This API will free all memory occupied by scanned AP list.`
`589`	`589`	`*`