From 73bce4012a8ff6e35df68e80c34d3f8c0b1897a4 Mon Sep 17 00:00:00 2001 From: yinqingzhao Date: Fri, 21 Nov 2025 19:25:26 +0800 Subject: [PATCH 1/7] fix(wifi): fix get incorrect current band after set bandmode --- components/esp_wifi/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index 40ce9cc0b77..55e15040f4d 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 40ce9cc0b772e66678b61e4f17bd00599f4a8a9a +Subproject commit 55e15040f4d4e651f3c276f6343b0089922b8cb8 From e0f90d995066adcc116057571b7a30d8ea27553d Mon Sep 17 00:00:00 2001 From: Akshat Agrawal Date: Thu, 27 Nov 2025 18:10:49 +0530 Subject: [PATCH 2/7] bugfix(wifi): Return to home channel as soon as offchan FTM is completed - Resolve memory corruption by avoiding integer underflow --- components/esp_wifi/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index 55e15040f4d..7dc6e0a7e46 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 55e15040f4d4e651f3c276f6343b0089922b8cb8 +Subproject commit 7dc6e0a7e46cf5547150726cbaaf84f0ccab7e2d From 82a6633607a0dbd3f55e6b22f26fcb90ee2454ad Mon Sep 17 00:00:00 2001 From: yinqingzhao Date: Fri, 28 Nov 2025 18:33:28 +0800 Subject: [PATCH 3/7] fix(wifi): fix some bugs related to ampdu --- components/esp_rom/esp32c6/ld/esp32c6.rom.net80211.ld | 1 - components/esp_wifi/lib | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/components/esp_rom/esp32c6/ld/esp32c6.rom.net80211.ld b/components/esp_rom/esp32c6/ld/esp32c6.rom.net80211.ld index 56761322bdc..ef8d8dac6f7 100644 --- a/components/esp_rom/esp32c6/ld/esp32c6.rom.net80211.ld +++ b/components/esp_rom/esp32c6/ld/esp32c6.rom.net80211.ld @@ -64,4 +64,3 @@ s_netstack_free = 0x4087ff94; mesh_rxcb = 0x4087ff90; sta_rxcb = 0x4087ff8c; g_itwt_fid = 0x4087ff88; -esp_test_tx_addba_request = 0x4087ff84; diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index 7dc6e0a7e46..ddf3c096fd3 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 7dc6e0a7e46cf5547150726cbaaf84f0ccab7e2d +Subproject commit ddf3c096fd3841e45389a90564acc380cccabb91 From baa6f312e5e7c61df76a4f5f694a384445857c77 Mon Sep 17 00:00:00 2001 From: yinqingzhao Date: Thu, 27 Nov 2025 16:38:34 +0800 Subject: [PATCH 4/7] fix(wifi): fix cannot send omc --- components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld b/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld index 105d01a0f11..60646765e00 100644 --- a/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld +++ b/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld @@ -299,7 +299,7 @@ tsf_hal_unmap_tbtt_target_to_rx_frame = 0x40001024; //ppHEAMPDU2Normal = 0x40001030; //ppCalTxHEAMPDULength = 0x40001034; //ppCalTxHESMPDULength = 0x40001038; -rcGetRate = 0x4000103c; +//rcGetRate = 0x4000103c; rcGetDCMMaxRate = 0x40001040; //rcGetSMPDURate = 0x40001044; ppDirectRecycleAmpdu = 0x40001048; From c1fc53ccb095123dbbaa7b7d613f51c088d774dc Mon Sep 17 00:00:00 2001 From: zhangyanjiao Date: Thu, 4 Dec 2025 14:29:15 +0800 Subject: [PATCH 5/7] fix(wifi): fixed the crash issue when vendor ie is NULL --- components/esp_wifi/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index ddf3c096fd3..dfe47c186d6 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit ddf3c096fd3841e45389a90564acc380cccabb91 +Subproject commit dfe47c186d6f2354b756d694d478595d2f59c753 From adb22338d5496fdcf9a98de848a9234b3998fbed Mon Sep 17 00:00:00 2001 From: muhaidong Date: Thu, 6 Nov 2025 21:10:31 +0800 Subject: [PATCH 6/7] fix(wifi): fix some wapi and fragment issues 1. fix gcmp fragment rx issue 2. support wapi fragment tx and rx 3. fix wapi uskid issue --- components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld | 2 +- components/esp_rom/esp32c2/ld/esp32c2.rom.ld | 2 +- components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld | 2 +- components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld | 2 +- components/esp_wifi/lib | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld index 3a0dafc1e46..56c8c141cac 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld @@ -30,7 +30,7 @@ pm_sleep = 0x40001bbc; //pm_tbtt_process = 0x40001bc4; ppAssembleAMPDU = 0x40001bcc; ppCalTxAMPDULength = 0x40001bd8; -ppRxFragmentProc = 0x40001c28; +/*ppRxFragmentProc = 0x40001c28;*/ ppRxPkt = 0x40001c2c; pp_coex_tx_request = 0x40001c54; /* rcGetSched = 0x40001c88; */ diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld index 2ae0baf1c85..75e7685f92d 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld @@ -711,7 +711,7 @@ wDev_Rxbuf_Deinit = 0x40001e5c; ppCalTkipMic = 0x40001e60; wDev_SnifferRxData = 0x40001e64; hal_crypto_enable = 0x40001e68; -hal_crypto_disable = 0x40001e6c; +/*hal_crypto_disable = 0x40001e6c;*/ wDev_Insert_KeyEntry = 0x40001e70; wDev_remove_KeyEntry = 0x40001e74; rc_enable_trc = 0x40001e78; diff --git a/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld b/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld index 53079241ddf..9aefdab3e0e 100644 --- a/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld +++ b/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld @@ -184,7 +184,7 @@ ppRecycleAmpdu = 0x40000e78; ppRecycleRxPkt = 0x40000e7c; ppResortTxAMPDU = 0x40000e80; ppResumeTxAMPDU = 0x40000e84; -ppRxFragmentProc = 0x40000e88; +/*ppRxFragmentProc = 0x40000e88;*/ /* ppRxPkt = 0x40000e8c; */ /* ppRxProtoProc = 0x40000e90; */ ppSearchTxQueue = 0x40000e94; diff --git a/components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld b/components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld index b648e2a8e1f..ad54aacc495 100644 --- a/components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld +++ b/components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld @@ -184,7 +184,7 @@ ppRecycleAmpdu = 0x40000df0; ppRecycleRxPkt = 0x40000df4; ppResortTxAMPDU = 0x40000df8; ppResumeTxAMPDU = 0x40000dfc; -ppRxFragmentProc = 0x40000e00; +/*ppRxFragmentProc = 0x40000e00;*/ /*ppRxPkt = 0x40000e04;*/ /*ppRxProtoProc = 0x40000e08;*/ ppSearchTxQueue = 0x40000e0c; diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index dfe47c186d6..d3ae55180c1 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit dfe47c186d6f2354b756d694d478595d2f59c753 +Subproject commit d3ae55180c1feccdd011535a113c265657499776 From 6eff30c0bba8033ed3551476fed7f0d854ea440a Mon Sep 17 00:00:00 2001 From: Akshat Agrawal Date: Tue, 9 Dec 2025 18:14:57 +0530 Subject: [PATCH 7/7] bugfix(wifi): Resolve the memory corruption issue in FTM --- components/esp_wifi/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index d3ae55180c1..f81d2dc8292 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit d3ae55180c1feccdd011535a113c265657499776 +Subproject commit f81d2dc82923e452cb990c1f74fdda4267ff2f6b