From ac0bfa67691a1681c2eb8a82c03d0afbbd9ad41e Mon Sep 17 00:00:00 2001
From: "wangtao@espressif.com" <wangtao@espressif.com>
Date: Fri, 25 Oct 2024 14:20:10 +0800
Subject: [PATCH 1/2] fix(wifi): fix esp32s2 get ack rssi issue

---
 components/esp_rom/esp32c2/ld/esp32c2.rom.ld      | 6 +++---
 components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld | 2 +-
 components/esp_rom/esp32c3/ld/esp32c3.rom.ld      | 2 +-
 components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld   | 4 ++--
 components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld | 4 ++--
 components/esp_rom/esp32s3/ld/esp32s3.rom.ld      | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
index 27caa88558..dee8760389 100644
--- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
+++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
@@ -1495,8 +1495,8 @@ rcSetTxAmpduLimit = 0x40001c90;
 /* rcTxUpdatePer = 0x40001c94;*/
 rcUpdateAckSnr = 0x40001c98;
 /*rcUpdateRate = 0x40001c9c;*/
-rcUpdateTxDone = 0x40001ca0;
-rcUpdateTxDoneAmpdu2 = 0x40001ca4;
+/*rcUpdateTxDone = 0x40001ca0;*/
+/*rcUpdateTxDoneAmpdu2 = 0x40001ca4;*/
 rcUpSched = 0x40001ca8;
 rssi_margin = 0x40001cac;
 rx11NRate2AMPDULimit = 0x40001cb0;
@@ -1840,7 +1840,7 @@ ieee80211_alloc_tx_buf = 0x40002108;
 /* ieee80211_send_nulldata = 0x40002110; */
 /* ieee80211_setup_robust_mgmtframe = 0x40002114; */
 ieee80211_encap_null_data = 0x4000211c;
-ieee80211_send_deauth_no_bss = 0x40002120;
+//ieee80211_send_deauth_no_bss = 0x40002120;
 ieee80211_alloc_deauth = 0x40002124;
 ieee80211_send_proberesp = 0x40002128;
 ieee80211_getcapinfo = 0x40002130;
diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld
index cae78fca16..beaccc21dd 100644
--- a/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld
+++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld
@@ -27,7 +27,7 @@ ppProcTxSecFrame = 0x400016dc;
 /*ppRxFragmentProc = 0x40001704;*/
 /* rcGetSched = 0x40001764;*/
 rcTxUpdatePer = 0x40001770;
-rcUpdateTxDone = 0x4000177c;
+/*rcUpdateTxDone = 0x4000177c;*/
 wDevCheckBlockError = 0x400017b4;
 /* wDev_IndicateFrame = 0x400017c8;*/
 wDev_ProcessFiq = 0x400017f0;
diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
index 9ceaa372ee..559f5cade6 100644
--- a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
+++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
@@ -1609,7 +1609,7 @@ rcSetTxAmpduLimit = 0x4000176c;
 rcUpdateAckSnr = 0x40001774;
 /*rcUpdateRate = 0x40001778;*/
 /* rcUpdateTxDone = 0x4000177c; */
-rcUpdateTxDoneAmpdu2 = 0x40001780;
+/* rcUpdateTxDoneAmpdu2 = 0x40001780;*/
 rcUpSched = 0x40001784;
 rssi_margin = 0x40001788;
 rx11NRate2AMPDULimit = 0x4000178c;
diff --git a/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld b/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld
index 24ae23143f..43090c9bf3 100644
--- a/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld
+++ b/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld
@@ -130,8 +130,8 @@ rcSetTxAmpduLimit = 0x40000d88;
 rcTxUpdatePer = 0x40000d8c;
 rcUpdateAckSnr = 0x40000d90;
 /*rcUpdateRate = 0x40000d94;*/
-rcUpdateTxDone = 0x40000d98;
-rcUpdateTxDoneAmpdu2 = 0x40000d9c;
+/*rcUpdateTxDone = 0x40000d98;*/
+/*rcUpdateTxDoneAmpdu2 = 0x40000d9c;*/
 rcUpSched = 0x40000da0;
 rssi_margin = 0x40000da4;
 rx11NRate2AMPDULimit = 0x40000da8;
diff --git a/components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld b/components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld
index 6744c5509e..9974f45cb5 100644
--- a/components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld
+++ b/components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld
@@ -129,8 +129,8 @@ rcSetTxAmpduLimit = 0x40000ca4;
 rcTxUpdatePer = 0x40000ca8;
 rcUpdateAckSnr = 0x40000cac;
 rcUpdateRate = 0x40000cb0;
-rcUpdateTxDone = 0x40000cb4;
-rcUpdateTxDoneAmpdu2 = 0x40000cb8;
+/*rcUpdateTxDone = 0x40000d98;*/
+/*rcUpdateTxDoneAmpdu2 = 0x40000d9c;*/
 rcUpSched = 0x40000cbc;
 rssi_margin = 0x40000cc0;
 rx11NRate2AMPDULimit = 0x40000cc4;
diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
index 888b55b05e..a8818575a6 100644
--- a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
+++ b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
@@ -1890,7 +1890,7 @@ rcSetTxAmpduLimit = 0x40005784;
 rcUpdateAckSnr = 0x4000579c;
 /*rcUpdateRate = 0x400057a8;*/
 /* rcUpdateTxDone = 0x400057b4; */
-rcUpdateTxDoneAmpdu2 = 0x400057c0;
+/* rcUpdateTxDoneAmpdu2 = 0x400057c0;*/
 rcUpSched = 0x400057cc;
 rssi_margin = 0x400057d8;
 rx11NRate2AMPDULimit = 0x400057e4;

From 2397ca90cc135f53d34663aa161005d8e885342c Mon Sep 17 00:00:00 2001
From: "wangtao@espressif.com" <wangtao@espressif.com>
Date: Fri, 25 Oct 2024 14:39:46 +0800
Subject: [PATCH 2/2] fix(wifi): backport some wifi bug fixs v53

---
 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 b45189fc03..39515d58b3 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit b45189fc038289175c3277593d02bdfc5e2402eb
+Subproject commit 39515d58b38bb988f7f5f7d2b9471983f8a33848