From 398403e2516d84b0b8771892d493799383388168 Mon Sep 17 00:00:00 2001 From: muhaidong Date: Fri, 9 Jun 2023 23:06:20 +0800 Subject: [PATCH] esp_wifi: fix some txop issues --- components/esp_rom/esp32c2/ld/esp32c2.rom.ld | 6 +++--- components/esp_rom/esp32c3/ld/esp32c3.rom.ld | 2 +- components/esp_rom/esp32s3/ld/esp32s3.rom.ld | 2 +- components/esp_wifi/lib | 2 +- 4 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 562f4c4345..67d8ccdc25 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld @@ -1545,7 +1545,7 @@ lmacReachLongLimit = 0x40001b3c; lmacReachShortLimit = 0x40001b40; lmacRecycleMPDU = 0x40001b44; lmacRxDone = 0x40001b48; -lmacSetTxFrame = 0x40001b4c; +/*lmacSetTxFrame = 0x40001b4c;*/ lmacTxDone = 0x40001b50; lmacTxFrame = 0x40001b54; mac_tx_set_duration = 0x40001b58; @@ -1685,7 +1685,7 @@ hal_mac_get_txq_pmd = 0x40001d6c; lmacDiscardFrameExchangeSequence = 0x40001d70; lmacDisableTransmit = 0x40001d74; lmacProcessTxTimeout = 0x40001d78; -lmacProcessTxSuccess = 0x40001d7c; +/*lmacProcessTxSuccess = 0x40001d7c;*/ lmacProcessCollision = 0x40001d80; lmacProcessTxRtsError = 0x40001d84; lmacProcessCtsTimeout = 0x40001d88; @@ -1702,7 +1702,7 @@ ppReSendBar = 0x40001db0; lmacProcessLongRetryFail = 0x40001db4; lmacRetryTxFrame = 0x40001db8; lmacProcessCollisions_task = 0x40001dbc; -lmacProcessTxopQComplete = 0x40001dc0; +/*lmacProcessTxopQComplete = 0x40001dc0;*/ lmacInitAc = 0x40001dc4; lmacInit = 0x40001dc8; mac_tx_set_txop_q = 0x40001dcc; diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld index 7f79ca9e7e..ae413e021c 100644 --- a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld +++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld @@ -1608,7 +1608,7 @@ lmacReachLongLimit = 0x40001618; lmacReachShortLimit = 0x4000161c; lmacRecycleMPDU = 0x40001620; lmacRxDone = 0x40001624; -lmacSetTxFrame = 0x40001628; +/*lmacSetTxFrame = 0x40001628;*/ /*lmacTxFrame = 0x40001630;*/ mac_tx_set_duration = 0x40001634; /* mac_tx_set_htsig = 0x40001638;*/ diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld index 1b3bb8eeff..ce5ca8ba2c 100644 --- a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld +++ b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld @@ -1918,7 +1918,7 @@ lmacReachLongLimit = 0x40005388; lmacReachShortLimit = 0x40005394; lmacRecycleMPDU = 0x400053a0; lmacRxDone = 0x400053ac; -lmacSetTxFrame = 0x400053b8; +/*lmacSetTxFrame = 0x400053b8;*/ lmacTxDone = 0x400053c4; /*lmacTxFrame = 0x400053d0;*/ mac_tx_set_duration = 0x400053dc; diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index cbb85ca9e8..3f0144cd0f 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit cbb85ca9e87eee604cc5ebfd5262e17a2b02d72e +Subproject commit 3f0144cd0f58073751f76c45f923b382440c58d0