From b20922c6d582082e151f269e0ddedb5ba7a79ef8 Mon Sep 17 00:00:00 2001
From: muhaidong <muhaidong@espressif.com>
Date: Fri, 26 May 2023 12:04:20 +0800
Subject: [PATCH 1/2] esp_wifi: fix some txop issues

---
 components/esp_rom/esp32c2/ld/esp32c2.rom.ld    | 6 +++---
 components/esp_rom/esp32c3/ld/esp32c3.rom.ld    | 2 +-
 components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld | 2 +-
 components/esp_rom/esp32s3/ld/esp32s3.rom.ld    | 2 +-
 components/esp_wifi/lib                         | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
index 7937ef4d9c..4cc5f098ad 100644
--- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
+++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
@@ -1546,7 +1546,7 @@ lmacReachLongLimit = 0x40001b3c;
 lmacReachShortLimit = 0x40001b40;
 lmacRecycleMPDU = 0x40001b44;
 lmacRxDone = 0x40001b48;
-lmacSetTxFrame = 0x40001b4c;
+/*lmacSetTxFrame = 0x40001b4c;*/
 lmacTxDone = 0x40001b50;
 lmacTxFrame = 0x40001b54;
 mac_tx_set_duration = 0x40001b58;
@@ -1686,7 +1686,7 @@ hal_mac_get_txq_pmd = 0x40001d6c;
 lmacDiscardFrameExchangeSequence = 0x40001d70;
 lmacDisableTransmit = 0x40001d74;
 lmacProcessTxTimeout = 0x40001d78;
-lmacProcessTxSuccess = 0x40001d7c;
+/*lmacProcessTxSuccess = 0x40001d7c;*/
 lmacProcessCollision = 0x40001d80;
 lmacProcessTxRtsError = 0x40001d84;
 lmacProcessCtsTimeout = 0x40001d88;
@@ -1703,7 +1703,7 @@ ppReSendBar = 0x40001db0;
 lmacProcessLongRetryFail = 0x40001db4;
 lmacRetryTxFrame = 0x40001db8;
 lmacProcessCollisions_task = 0x40001dbc;
-lmacProcessTxopQComplete = 0x40001dc0;
+/*lmacProcessTxopQComplete = 0x40001dc0;*/
 lmacInitAc = 0x40001dc4;
 lmacInit = 0x40001dc8;
 mac_tx_set_txop_q = 0x40001dcc;
diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
index 067243d151..70b1b78a92 100644
--- a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
+++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
@@ -1608,7 +1608,7 @@ lmacReachLongLimit = 0x40001618;
 lmacReachShortLimit = 0x4000161c;
 lmacRecycleMPDU = 0x40001620;
 lmacRxDone = 0x40001624;
-lmacSetTxFrame = 0x40001628;
+/*lmacSetTxFrame = 0x40001628;*/
 /*lmacTxFrame = 0x40001630;*/
 mac_tx_set_duration = 0x40001634;
 /* mac_tx_set_htsig = 0x40001638;*/
diff --git a/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld b/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld
index 0203afed0d..d9a21b624b 100644
--- a/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld
+++ b/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld
@@ -181,7 +181,7 @@ lmacProcessLongFrameSuccess = 0x40000e54;
 lmacProcessShortFrameSuccess = 0x40000e58;
 //lmacDiscardFrameExchangeSequence = 0x40000e5c;
 lmacProcessTBSuccess = 0x40000e60;
-lmacProcessTxSuccess = 0x40000e64;
+/*lmacProcessTxSuccess = 0x40000e64;*/
 lmacProcessAckTimeout = 0x40000e68;
 //lmacProcessTxComplete = 0x40000e6c;
 //ppRemoveHTC = 0x40000e70;
diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
index 4be67eac85..c046c49759 100644
--- a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
+++ b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
@@ -1918,7 +1918,7 @@ lmacReachLongLimit = 0x40005388;
 lmacReachShortLimit = 0x40005394;
 lmacRecycleMPDU = 0x400053a0;
 lmacRxDone = 0x400053ac;
-lmacSetTxFrame = 0x400053b8;
+/*lmacSetTxFrame = 0x400053b8;*/
 lmacTxDone = 0x400053c4;
 /*lmacTxFrame = 0x400053d0;*/
 mac_tx_set_duration = 0x400053dc;
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index 1998c24da5..f26ce40650 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit 1998c24da5c3c4a481075f0f4d659359e77fd414
+Subproject commit f26ce4065080b3cad7529725756f185444ee31ec

From 0602ed3b4c56237c8b1eed5809a7f653ed57e22c Mon Sep 17 00:00:00 2001
From: Kapil Gupta <kapil.gupta@espressif.com>
Date: Thu, 15 Jun 2023 14:51:09 +0530
Subject: [PATCH 2/2] esp_wifi: Remove direct call of malloc() and free()

---
 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 f26ce40650..c1a8747dab 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit f26ce4065080b3cad7529725756f185444ee31ec
+Subproject commit c1a8747dab1ef3a138195b0a7e5de8dd9dfe539e