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

Trigger null data frame TX before going offchannel.(v5.1) See merge request espressif/esp-idf!25095
espressif · Aug 4, 2023 · 6ec5267 · 6ec5267
2 parents 2c19659 + 9693461
commit 6ec5267
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
@@ -1720,15 +1720,15 @@ esp_wifi_internal_get_rts = 0x40001e04;
 /*esf_buf_setup = 0x40001e0c;*/
 hal_agreement_add_rx_ba = 0x40001e10;
 hal_agreement_del_rx_ba = 0x40001e14;
-hal_crypto_set_key_entry = 0x40001e18;
+/*hal_crypto_set_key_entry = 0x40001e18;*/
 hal_crypto_get_key_entry = 0x40001e1c;
 hal_crypto_clr_key_entry = 0x40001e20;
 config_get_wifi_task_stack_size = 0x40001e24;
 pp_create_task = 0x40001e28;
 hal_set_sta_tsf_wakeup = 0x40001e2c;
 hal_set_rx_beacon_pti = 0x40001e30;
 /* pm_start = 0x40001e34; */
-pm_stop = 0x40001e38;
+/* pm_stop = 0x40001e38; */
 hal_disable_sta_tbtt = 0x40001e3c;
 ppCalTxopDur = 0x40001e40;
 wDev_IndicateCtrlFrame = 0x40001e44;

diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
diff --git a/components/esp_wifi/src/wifi_init.c b/components/esp_wifi/src/wifi_init.c
@@ -165,6 +165,7 @@ esp_err_t esp_wifi_deinit(void)
 #endif
     esp_wifi_power_domain_off();
 #if CONFIG_MAC_BB_PD
+    esp_wifi_internal_set_mac_sleep(false);
     esp_mac_bb_pd_mem_deinit();
 #endif
     esp_phy_modem_deinit();
+ −		esp32/libcore.a
+ −		esp32/libespnow.a
+ −		esp32/libmesh.a
+ −		esp32/libnet80211.a
+ −		esp32/libpp.a
+ −		esp32/libsmartconfig.a
+ −		esp32/libwapi.a
+ −		esp32c2/libcore.a
+ −		esp32c2/libespnow.a
+ −		esp32c2/libnet80211.a
+ −		esp32c2/libpp.a
+ −		esp32c2/libsmartconfig.a
+ −		esp32c3/libcore.a
+ −		esp32c3/libespnow.a
+ −		esp32c3/libmesh.a
+ −		esp32c3/libnet80211.a
+ −		esp32c3/libpp.a
+ −		esp32c3/libsmartconfig.a
+ −		esp32c3/libwapi.a
+ −		esp32c6/libcore.a
+ −		esp32c6/libespnow.a
+ −		esp32c6/libmesh.a
+ −		esp32c6/libnet80211.a
+ −		esp32c6/libpp.a
+ −		esp32c6/libsmartconfig.a
+ −		esp32c6/libwapi.a
+ −		esp32s2/libcore.a
+ −		esp32s2/libespnow.a
+ −		esp32s2/libmesh.a
+ −		esp32s2/libnet80211.a
+ −		esp32s2/libpp.a
+ −		esp32s2/libsmartconfig.a
+ −		esp32s2/libwapi.a
+ −		esp32s3/libcore.a
+ −		esp32s3/libespnow.a
+ −		esp32s3/libmesh.a
+ −		esp32s3/libnet80211.a
+ −		esp32s3/libpp.a
+ −		esp32s3/libsmartconfig.a
+ −		esp32s3/libwapi.a