Merge branch 'bugfix/fix_some_wifi_bugs_240411_v5.1' into 'release/v5.1'

fix(wifi): fixed some wifi issue 240411(Backport v5.1) See merge request espressif/esp-idf!30187
espressif · Apr 12, 2024 · 592b7a9 · 592b7a9
2 parents 35d5ea1 + edbf44b
commit 592b7a9
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
@@ -1483,7 +1483,7 @@ is_lmac_idle = 0x40001b0c;
 /*lmacAdjustTimestamp = 0x40001b10;*/
 lmacDiscardAgedMSDU = 0x40001b14;
 /*lmacDiscardMSDU = 0x40001b18;*/
-lmacEndFrameExchangeSequence = 0x40001b1c;
+/*lmacEndFrameExchangeSequence = 0x40001b1c;*/
 lmacIsIdle = 0x40001b20;
 lmacIsLongFrame = 0x40001b24;
 /*lmacMSDUAged = 0x40001b28;*/
@@ -1845,7 +1845,7 @@ ic_ebuf_recycle_rx = 0x40001fa0;
 ic_ebuf_recycle_tx = 0x40001fa4;
 ic_reset_rx_ba = 0x40001fa8;
 ieee80211_align_eb = 0x40001fac;
-ieee80211_ampdu_reorder = 0x40001fb0;
+/*ieee80211_ampdu_reorder = 0x40001fb0;*/
 ieee80211_ampdu_start_age_timer = 0x40001fb4;
 /*ieee80211_encap_esfbuf = 0x40001fb8;*/
 ieee80211_is_tx_allowed = 0x40001fbc;

diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
@@ -1516,7 +1516,7 @@ is_lmac_idle = 0x400015e8;
 /*lmacAdjustTimestamp = 0x400015ec;*/
 lmacDiscardAgedMSDU = 0x400015f0;
 /*lmacDiscardMSDU = 0x400015f4;*/
-lmacEndFrameExchangeSequence = 0x400015f8;
+/*lmacEndFrameExchangeSequence = 0x400015f8;*/
 lmacIsIdle = 0x400015fc;
 lmacIsLongFrame = 0x40001600;
 /*lmacMSDUAged = 0x40001604;*/
@@ -1717,7 +1717,7 @@ ic_ebuf_recycle_rx = 0x40001844;
 ic_ebuf_recycle_tx = 0x40001848;
 ic_reset_rx_ba = 0x4000184c;
 ieee80211_align_eb = 0x40001850;
-ieee80211_ampdu_reorder = 0x40001854;
+/*ieee80211_ampdu_reorder = 0x40001854;*/
 ieee80211_ampdu_start_age_timer = 0x40001858;
 /*ieee80211_encap_esfbuf = 0x4000185c;*/
 ieee80211_is_tx_allowed = 0x40001860;

diff --git a/components/esp_rom/esp32c6/ld/esp32c6.rom.net80211.ld b/components/esp_rom/esp32c6/ld/esp32c6.rom.net80211.ld
@@ -31,7 +31,7 @@ ic_ebuf_recycle_rx = 0x40000b70;
 ic_ebuf_recycle_tx = 0x40000b74;
 ic_reset_rx_ba = 0x40000b78;
 ieee80211_align_eb = 0x40000b7c;
-ieee80211_ampdu_reorder = 0x40000b80;
+/*ieee80211_ampdu_reorder = 0x40000b80;*/
 ieee80211_ampdu_start_age_timer = 0x40000b84;
 /*ieee80211_encap_esfbuf = 0x40000b88;*/
 ieee80211_is_tx_allowed = 0x40000b8c;

diff --git a/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld b/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld
@@ -37,7 +37,7 @@ is_lmac_idle = 0x40000c14;
 /*lmacAdjustTimestamp = 0x40000c18;*/
 lmacDiscardAgedMSDU = 0x40000c1c;
 /*lmacDiscardMSDU = 0x40000c20;*/
-lmacEndFrameExchangeSequence = 0x40000c24;
+/*lmacEndFrameExchangeSequence = 0x40000c24;*/
 lmacIsIdle = 0x40000c28;
 lmacIsLongFrame = 0x40000c2c;
 /*lmacMSDUAged = 0x40000c30;*/

diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
@@ -1817,7 +1817,7 @@ is_lmac_idle = 0x400052f8;
 /*lmacAdjustTimestamp = 0x40005304;*/
 lmacDiscardAgedMSDU = 0x40005310;
 /*lmacDiscardMSDU = 0x4000531c;*/
-lmacEndFrameExchangeSequence = 0x40005328;
+/*lmacEndFrameExchangeSequence = 0x40005328;*/
 lmacIsIdle = 0x40005334;
 lmacIsLongFrame = 0x40005340;
 /*lmacMSDUAged = 0x4000534c;*/
@@ -2025,7 +2025,7 @@ ic_ebuf_recycle_rx = 0x40005a24;
 ic_ebuf_recycle_tx = 0x40005a30;
 ic_reset_rx_ba = 0x40005a3c;
 ieee80211_align_eb = 0x40005a48;
-ieee80211_ampdu_reorder = 0x40005a54;
+/* ieee80211_ampdu_reorder = 0x40005a54; */
 ieee80211_ampdu_start_age_timer = 0x40005a60;
 /* ieee80211_encap_esfbuf = 0x40005a6c; */
 ieee80211_is_tx_allowed = 0x40005a78;

diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib