From 862f3bd7bf8f917a43c034e8176649dd9f3b32f6 Mon Sep 17 00:00:00 2001
From: Aditi <aditi.lonkar@espressif.com>
Date: Tue, 5 Nov 2024 17:36:40 +0530
Subject: [PATCH 1/2] fix(esp_wifi): Fix for crash while receiving deauth in
 esp32c2 ECO4

---
 components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld | 6 +++---
 components/esp_rom/esp32c2/ld/esp32c2.rom.ld      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld
index 4cbcc4849386..b1f38aad9ce5 100644
--- a/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld
+++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld
@@ -1194,8 +1194,8 @@ ieee80211_output_process = 0x40001fc4;
 sta_input = 0x40001fcc;
 ieee80211_classify = 0x40001fe0;
 ieee80211_crypto_decap = 0x40001ff8;
-ieee80211_ccmp_decrypt = 0x4000200c;
-ieee80211_ccmp_encrypt = 0x40002010;
+//ieee80211_ccmp_decrypt = 0x4000200c;
+//ieee80211_ccmp_encrypt = 0x40002010;
 //ieee80211_send_action_vendor_spec = 0x40002034;
 ieee80211_send_mgmt = 0x40002038;
 //ieee80211_auth_construct = 0x4000203c;
@@ -1214,7 +1214,7 @@ cnx_coexist_timeout_process = 0x400020ac;
 ieee80211_add_extcap = 0x400020cc;
 //ieee80211_alloc_proberesp = 0x400020d8;
 esp_wifi_80211_tx = 0x400020f8;
-ieee80211_crypto_aes_128_cmac_decrypt = 0x40002104;
+/* ieee80211_crypto_aes_128_cmac_decrypt = 0x40002104; */
 ieee80211_output_do = 0x4000210c;
 ieee80211_send_nulldata = 0x40002110;
 //ieee80211_setup_robust_mgmtframe = 0x40002114;
diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
index 2abe48222a5f..3dbbb8aacd12 100644
--- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
+++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
@@ -1834,7 +1834,7 @@ ieee80211_amsdu_length_check = 0x400020ec;
 ieee80211_encap_amsdu = 0x400020f0;
 ieee80211_output_raw_process = 0x400020f4;
 ieee80211_raw_frame_sanity_check = 0x400020fc;
-ieee80211_crypto_aes_128_cmac_encrypt = 0x40002100;
+//ieee80211_crypto_aes_128_cmac_encrypt = 0x40002100;
 ieee80211_alloc_tx_buf = 0x40002108;
 /* ieee80211_output_do = 0x4000210c; */
 /* ieee80211_send_nulldata = 0x40002110; */

From 9ec62baa94a7e061ab5979bff6fda18355094a3f Mon Sep 17 00:00:00 2001
From: akshat <akshat.agrawal@espressif.com>
Date: Mon, 4 Nov 2024 14:57:58 +0530
Subject: [PATCH 2/2] fix(esp_rom): Comment out unused function pointers in
 esp32c2 eco4 linker file

---
 components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld
index b1f38aad9ce5..4f35bfd10b86 100644
--- a/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld
+++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld
@@ -1222,10 +1222,10 @@ ieee80211_send_nulldata = 0x40002110;
 ieee80211_send_deauth = 0x40002120;
 //ieee80211_tx_mgt_cb = 0x4000212c;
 sta_rx_csa = 0x40002134;
-sta_send_sa_query_req = 0x40002138;
+/*sta_send_sa_query_req = 0x40002138;
 sta_send_sa_query_resp = 0x4000213c;
 sta_recv_sa_query_req = 0x40002140;
-sta_recv_sa_query_resp = 0x40002144;
+sta_recv_sa_query_resp = 0x40002144;*/
 //ieee80211_parse_beacon = 0x40002148;
 ieee80211_match_security = 0x40002154;
 //ieee80211_parse_rsn = 0x4000215c;