From d618d1d934e1d54e57adfce0320abcf0e10d6392 Mon Sep 17 00:00:00 2001
From: "wangtao@espressif.com" <wangtao@espressif.com>
Date: Fri, 27 Sep 2024 18:39:57 +0800
Subject: [PATCH] fix(wifi): fix ampdu to normal cause free buffer twice issue

---
 components/esp_rom/esp32c2/ld/esp32c2.rom.ld      | 2 +-
 components/esp_rom/esp32c3/ld/esp32c3.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_rom/esp32s3/ld/esp32s3.rom.ld      | 2 +-
 components/esp_wifi/lib                           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
index 166dadf4ee..5aad613588 100644
--- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
+++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
@@ -1457,7 +1457,7 @@ ppGetTxframe = 0x40001bf8;
 ppMapTxQueue = 0x40001bfc;
 ppProcTxSecFrame = 0x40001c00;
 ppProcessRxPktHdr = 0x40001c04;
-ppProcessTxQ = 0x40001c08;
+/*ppProcessTxQ = 0x40001c08;*/
 ppRecordBarRRC = 0x40001c0c;
 lmacRequestTxopQueue = 0x40001c10;
 lmacReleaseTxopQueue = 0x40001c14;
diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
index 793e7d8d9a..559f5cade6 100644
--- a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
+++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
@@ -1571,7 +1571,7 @@ ppEnqueueTxDone = 0x400016cc;
 ppGetTxQFirstAvail_Locked = 0x400016d0;
 ppGetTxframe = 0x400016d4;
 ppProcessRxPktHdr = 0x400016e0;
-ppProcessTxQ = 0x400016e4;
+/*ppProcessTxQ = 0x400016e4;*/
 ppRecordBarRRC = 0x400016e8;
 lmacRequestTxopQueue = 0x400016ec;
 lmacReleaseTxopQueue = 0x400016f0;
diff --git a/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld b/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld
index a72cb8e5b7..605063d1c6 100644
--- a/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld
+++ b/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld
@@ -180,7 +180,7 @@ ppGetTxframe = 0x40000e60;
 ppMapTxQueue = 0x40000e64;
 ppProcTxSecFrame = 0x40000e68;
 ppProcessRxPktHdr = 0x40000e6c;
-ppProcessTxQ = 0x40000e70;
+/*ppProcessTxQ = 0x40000e70;*/
 ppRecordBarRRC = 0x40000e74;
 ppRecycleAmpdu = 0x40000e78;
 ppRecycleRxPkt = 0x40000e7c;
diff --git a/components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld b/components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld
index f23dfdec23..54f0a48c42 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 @@ ppGetTxframe = 0x40000dd8;
 ppMapTxQueue = 0x40000ddc;
 ppProcTxSecFrame = 0x40000de0;
 ppProcessRxPktHdr = 0x40000de4;
-ppProcessTxQ = 0x40000de8;
+/*ppProcessTxQ = 0x40000de8;*/
 ppRecordBarRRC = 0x40000dec;
 ppRecycleAmpdu = 0x40000df0;
 ppRecycleRxPkt = 0x40000df4;
diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
index e60065d6b9..a8818575a6 100644
--- a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
+++ b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
@@ -1851,7 +1851,7 @@ ppGetTxQFirstAvail_Locked = 0x400055b0;
 ppGetTxframe = 0x400055bc;
 /*ppMapTxQueue = 0x400055c8;*/
 ppProcessRxPktHdr = 0x400055e0;
-ppProcessTxQ = 0x400055ec;
+/*ppProcessTxQ = 0x400055ec;*/
 ppRecordBarRRC = 0x400055f8;
 lmacRequestTxopQueue = 0x40005604;
 lmacReleaseTxopQueue = 0x40005610;
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index e622b6256d..dde71a69c5 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit e622b6256d1367171556ea2f87aef0e6dd57087c
+Subproject commit dde71a69c525d0a69989eca620557536b2773231