From d8b600e90b8452f69c8b90c74e58146e1506ff24 Mon Sep 17 00:00:00 2001
From: muhaidong <muhaidong@espressif.com>
Date: Mon, 25 Sep 2023 15:12:44 +0800
Subject: [PATCH] fix(wifi): fix some wifi issues 1. fix enable psram wapi dhcp
 fail issue 2. fix c6 esp_wifi_set_max_tx_power fail issue 3. fix wrong wifi
 mode connect crash issue 4. fix null data sequence number issue

---
 components/esp_rom/esp32c2/ld/esp32c2.rom.ld          | 4 ++--
 components/esp_rom/esp32c3/ld/esp32c3.rom.ld          | 2 +-
 components/esp_rom/esp32c6/ld/esp32c6.rom.net80211.ld | 2 +-
 components/esp_rom/esp32s3/ld/esp32s3.rom.ld          | 2 +-
 components/esp_wifi/lib                               | 2 +-
 5 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 4eee3dd4f9..d4bda4a96f 100644
--- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
+++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
@@ -1876,7 +1876,7 @@ ieee80211_ampdu_start_age_timer = 0x40001fb4;
 ieee80211_encap_esfbuf = 0x40001fb8;
 ieee80211_is_tx_allowed = 0x40001fbc;
 ieee80211_output_pending_eb = 0x40001fc0;
-ieee80211_output_process = 0x40001fc4;
+/* ieee80211_output_process = 0x40001fc4; */
 ieee80211_set_tx_desc = 0x40001fc8;
 /*sta_input = 0x40001fcc;*/
 wifi_get_macaddr = 0x40001fd0;
@@ -1947,7 +1947,7 @@ ieee80211_output_raw_process = 0x400020f4;
 ieee80211_raw_frame_sanity_check = 0x400020fc;
 ieee80211_crypto_aes_128_cmac_encrypt = 0x40002100;
 ieee80211_alloc_tx_buf = 0x40002108;
-ieee80211_output_do = 0x4000210c;
+/* ieee80211_output_do = 0x4000210c; */
 /* ieee80211_send_nulldata = 0x40002110; */
 ieee80211_setup_robust_mgmtframe = 0x40002114;
 ieee80211_encap_null_data = 0x4000211c;
diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
index ccb936504f..69939b849a 100644
--- a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
+++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
@@ -1808,7 +1808,7 @@ ieee80211_ampdu_start_age_timer = 0x40001858;
 /*ieee80211_encap_esfbuf = 0x4000185c;*/
 ieee80211_is_tx_allowed = 0x40001860;
 ieee80211_output_pending_eb = 0x40001864;
-ieee80211_output_process = 0x40001868;
+/*ieee80211_output_process = 0x40001868;*/
 ieee80211_set_tx_desc = 0x4000186c;
 rom_sta_input = 0x40001870;
 wifi_get_macaddr = 0x40001874;
diff --git a/components/esp_rom/esp32c6/ld/esp32c6.rom.net80211.ld b/components/esp_rom/esp32c6/ld/esp32c6.rom.net80211.ld
index ba01cb6665..e5bd02bd98 100644
--- a/components/esp_rom/esp32c6/ld/esp32c6.rom.net80211.ld
+++ b/components/esp_rom/esp32c6/ld/esp32c6.rom.net80211.ld
@@ -36,7 +36,7 @@ ieee80211_ampdu_start_age_timer = 0x40000b84;
 ieee80211_encap_esfbuf = 0x40000b88;
 ieee80211_is_tx_allowed = 0x40000b8c;
 ieee80211_output_pending_eb = 0x40000b90;
-ieee80211_output_process = 0x40000b94;
+/*ieee80211_output_process = 0x40000b94;*/
 ieee80211_set_tx_desc = 0x40000b98;
 //sta_input = 0x40000b9c;
 wifi_get_macaddr = 0x40000ba0;
diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
index 80a5b1136f..ca7ddf111a 100644
--- a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
+++ b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
@@ -2125,7 +2125,7 @@ ieee80211_ampdu_start_age_timer = 0x40005a60;
 /* ieee80211_encap_esfbuf = 0x40005a6c; */
 ieee80211_is_tx_allowed = 0x40005a78;
 ieee80211_output_pending_eb = 0x40005a84;
-ieee80211_output_process = 0x40005a90;
+/*ieee80211_output_process = 0x40005a90;*/
 ieee80211_set_tx_desc = 0x40005a9c;
 /*sta_input = 0x40005aa8;*/
 wifi_get_macaddr = 0x40005ab4;
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index 174341fbe1..dee1fbe2ca 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit 174341fbe17d6527f25a1c4e936323b6f3e691e2
+Subproject commit dee1fbe2ca92284fbaeb7cef8d8298c06a00dc6a