Merge branch 'bugfix/fix_lmac_stop_transmit_issue' into 'master'

fix(wifi): fix lmacStopTransmit issue Closes WIFI-6519 and WIFIBUG-401 See merge request espressif/esp-idf!30147
TrackliDev · Apr 12, 2024 · 9aa1bc6 · 9aa1bc6
2 parents d4552c6 + 6d97ebf
commit 9aa1bc6
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
@@ -1408,7 +1408,7 @@ is_lmac_idle = 0x40001b0c;
 /*lmacAdjustTimestamp = 0x40001b10;*/
 lmacDiscardAgedMSDU = 0x40001b14;
 /*lmacDiscardMSDU = 0x40001b18;*/
-lmacEndFrameExchangeSequence = 0x40001b1c;
+/*lmacEndFrameExchangeSequence = 0x40001b1c;*/
 lmacIsIdle = 0x40001b20;
 lmacIsLongFrame = 0x40001b24;
 /*lmacMSDUAged = 0x40001b28;*/

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;*/

diff --git a/components/esp_rom/esp32c5/mp/esp32c5/ld/esp32c5.rom.pp.ld b/components/esp_rom/esp32c5/mp/esp32c5/ld/esp32c5.rom.pp.ld
@@ -62,7 +62,7 @@ ic_get_he_rts_threshold_bytes = 0x40000c88;
 lmacAdjustTimestamp = 0x40000c8c;
 lmacDiscardAgedMSDU = 0x40000c90;
 lmacDiscardMSDU = 0x40000c94;
-lmacEndFrameExchangeSequence = 0x40000c98;
+/*lmacEndFrameExchangeSequence = 0x40000c98;*/
 lmacIsIdle = 0x40000c9c;
 lmacIsLongFrame = 0x40000ca0;
 lmacMSDUAged = 0x40000ca4;

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
@@ -1793,7 +1793,7 @@ is_lmac_idle = 0x400052f8;
 /*lmacAdjustTimestamp = 0x40005304;*/
 lmacDiscardAgedMSDU = 0x40005310;
 /*lmacDiscardMSDU = 0x4000531c;*/
-lmacEndFrameExchangeSequence = 0x40005328;
+/*lmacEndFrameExchangeSequence = 0x40005328;*/
 lmacIsIdle = 0x40005334;
 lmacIsLongFrame = 0x40005340;
 /*lmacMSDUAged = 0x4000534c;*/

diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
+ −		esp32/libcore.a
+ −		esp32/libespnow.a
+ −		esp32/libmesh.a
+ −		esp32/libnet80211.a
+ −		esp32/libpp.a
+ −		esp32/libsmartconfig.a
+ −		esp32/libtarget.a
+ −		esp32/libwapi.a
+ −		esp32_host/libcore.a
+ −		esp32_host/libespnow.a
+ −		esp32_host/libmesh.a
+ −		esp32_host/libnet80211.a
+ −		esp32_host/libpp.a
+ −		esp32_host/libsmartconfig.a
+ −		esp32_host/libtarget.a
+ −		esp32_host/libwapi.a
+ −		esp32c2/libcore.a
+ −		esp32c2/libespnow.a
+ −		esp32c2/libnet80211.a
+ −		esp32c2/libpp.a
+ −		esp32c2/libsmartconfig.a
+ −		esp32c2/libtarget.a
+ −		esp32c3/libcore.a
+ −		esp32c3/libespnow.a
+ −		esp32c3/libmesh.a
+ −		esp32c3/libnet80211.a
+ −		esp32c3/libpp.a
+ −		esp32c3/libsmartconfig.a
+ −		esp32c3/libtarget.a
+ −		esp32c3/libwapi.a
+ −		esp32c5/libcore.a
+ −		esp32c5/libespnow.a
+ −		esp32c5/libmesh.a
+ −		esp32c5/libnet80211.a
+ −		esp32c5/libpp.a
+ −		esp32c5/libsmartconfig.a
+ −		esp32c5/libtarget.a
+ −		esp32c5/libwapi.a
+ −		esp32c6/libcore.a
+ −		esp32c6/libespnow.a
+ −		esp32c6/libmesh.a
+ −		esp32c6/libnet80211.a
+ −		esp32c6/libpp.a
+ −		esp32c6/libsmartconfig.a
+ −		esp32c6/libtarget.a
+ −		esp32c6/libwapi.a
+ −		esp32s2/libcore.a
+ −		esp32s2/libespnow.a
+ −		esp32s2/libmesh.a
+ −		esp32s2/libnet80211.a
+ −		esp32s2/libpp.a
+ −		esp32s2/libsmartconfig.a
+ −		esp32s2/libtarget.a
+ −		esp32s2/libwapi.a
+ −		esp32s3/libcore.a
+ −		esp32s3/libespnow.a
+ −		esp32s3/libmesh.a
+ −		esp32s3/libnet80211.a
+ −		esp32s3/libpp.a
+ −		esp32s3/libsmartconfig.a
+ −		esp32s3/libtarget.a
+ −		esp32s3/libwapi.a