Merge branch 'bugfix/fix_task_wdt_in_mplen_clear_v5.1' into 'release/v5.1'

jack0c · jack0c · commit e524ab1ede74 · 2024-03-12T10:56:54.000+08:00
fix(wifi):fix issues that in mplen clear and esp_wifi_set_mode(Backport v5.1)

See merge request espressif/esp-idf!29530
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit 46342b66b8cd053a0de1ff3f0b8c853c92cbbfb3
+Subproject commit cd8d74b378f6e3e749c5b0c2c1602571e3a0c75a
diff --git a/examples/wifi/iperf/sdkconfig.defaults b/examples/wifi/iperf/sdkconfig.defaults
@@ -12,6 +12,4 @@ CONFIG_LWIP_TCPIP_TASK_PRIO=23
 
 CONFIG_IPERF_TRAFFIC_TASK_PRIORITY=23
 CONFIG_IPERF_REPORT_TASK_PRIORITY=24
-CONFIG_LWIP_TCPIP_CORE_LOCKING=y
-CONFIG_LWIP_TCPIP_CORE_LOCKING_INPUT=y
 CONFIG_COMPILER_OPTIMIZATION_PERF=y
diff --git a/examples/wifi/iperf/sdkconfig.defaults.esp32c2 b/examples/wifi/iperf/sdkconfig.defaults.esp32c2
@@ -20,3 +20,6 @@ CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=120
 
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_60M=y
+
+CONFIG_LWIP_TCPIP_CORE_LOCKING=y
+CONFIG_LWIP_TCPIP_CORE_LOCKING_INPUT=y
diff --git a/examples/wifi/iperf/sdkconfig.defaults.esp32c3 b/examples/wifi/iperf/sdkconfig.defaults.esp32c3
@@ -20,3 +20,6 @@ CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=160
 
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
+
+CONFIG_LWIP_TCPIP_CORE_LOCKING=y
+CONFIG_LWIP_TCPIP_CORE_LOCKING_INPUT=y
diff --git a/examples/wifi/iperf/sdkconfig.defaults.esp32c6 b/examples/wifi/iperf/sdkconfig.defaults.esp32c6
@@ -23,3 +23,6 @@ CONFIG_ESP_WIFI_ENABLE_WIFI_TX_STATS=n
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_LWIP_EXTRA_IRAM_OPTIMIZATION=y
+
+CONFIG_LWIP_TCPIP_CORE_LOCKING=y
+CONFIG_LWIP_TCPIP_CORE_LOCKING_INPUT=y
diff --git a/examples/wifi/iperf/sdkconfig.defaults.esp32s2 b/examples/wifi/iperf/sdkconfig.defaults.esp32s2
@@ -24,3 +24,6 @@ CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_ESP32S2_INSTRUCTION_CACHE_16KB=y
 CONFIG_ESP32S2_INSTRUCTION_CACHE_LINE_16B=y
 CONFIG_ESP32S2_INSTRUCTION_CACHE_WRAP=y
+
+CONFIG_LWIP_TCPIP_CORE_LOCKING=y
+CONFIG_LWIP_TCPIP_CORE_LOCKING_INPUT=y
