Merge branch 'bugfix/fix_esp32_cant_tx_after_tx_timeout_v4.4' into 'r…

…elease/v4.4' fix(wifi): fix esp32 unrecoverable m f issue, fix rxAppendBlock issue See merge request espressif/esp-idf!31136
espressif · May 28, 2024 · c0e0af0 · c0e0af0
2 parents 1e877f6 + b8477e0
commit c0e0af0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
@@ -1623,7 +1623,7 @@ TRC_PER_IS_GOOD = 0x400017a4;
 trc_SetTxAmpduState = 0x400017a8;
 trc_tid_isTxAmpduOperational = 0x400017ac;
 trcAmpduSetState = 0x400017b0;
-wDev_AppendRxBlocks = 0x400017b8;
+//wDev_AppendRxBlocks = 0x400017b8;
 wDev_DiscardFrame = 0x400017bc;
 wDev_GetNoiseFloor = 0x400017c0;
 wDev_IndicateAmpdu = 0x400017c4;

diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
@@ -1927,7 +1927,7 @@ trc_SetTxAmpduState = 0x40005838;
 trc_tid_isTxAmpduOperational = 0x40005844;
 trcAmpduSetState = 0x40005850;
 wDevCheckBlockError = 0x4000585c;
-wDev_AppendRxBlocks = 0x40005868;
+//wDev_AppendRxBlocks = 0x40005868;
 wDev_DiscardFrame = 0x40005874;
 wDev_GetNoiseFloor = 0x40005880;
 wDev_IndicateAmpdu = 0x4000588c;

diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
+ −		esp32/libcoexist.a
+ −		esp32/libcore.a
+ −		esp32/libespnow.a
+ −		esp32/libmesh.a
+ −		esp32/libnet80211.a
+ −		esp32/libpp.a
+ −		esp32/libsmartconfig.a
+ −		esp32/libwapi.a
+ −		esp32c3/libcoexist.a
+ −		esp32c3/libcore.a
+ −		esp32c3/libespnow.a
+ −		esp32c3/libmesh.a
+ −		esp32c3/libnet80211.a
+ −		esp32c3/libpp.a
+ −		esp32c3/libsmartconfig.a
+ −		esp32c3/libwapi.a
+ −		esp32s2/libcoexist.a
+ −		esp32s2/libcore.a
+ −		esp32s2/libespnow.a
+ −		esp32s2/libmesh.a
+ −		esp32s2/libnet80211.a
+ −		esp32s2/libpp.a
+ −		esp32s2/libsmartconfig.a
+ −		esp32s2/libwapi.a
+ −		esp32s3/libcoexist.a
+ −		esp32s3/libcore.a
+ −		esp32s3/libespnow.a
+ −		esp32s3/libmesh.a
+ −		esp32s3/libnet80211.a
+ −		esp32s3/libpp.a
+ −		esp32s3/libsmartconfig.a
+ −		esp32s3/libwapi.a