Skip to content

Commit a0f798c

Browse files
author
Jiang Jiang Jian
committed
Merge branch 'bugfix/fix_some_wifi_bugs_241024_v5.3' into 'release/v5.3'
fix(wifi): fix some wifi bugs 241024 v5.3 See merge request espressif/esp-idf!34420
2 parents 5f5feed + 2b894fc commit a0f798c

File tree

7 files changed

+8
-6
lines changed

7 files changed

+8
-6
lines changed

components/esp_phy/src/phy_init.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,8 @@ void esp_phy_disable(esp_phy_modem_t modem)
313313
phy_digital_regs_store();
314314
#endif
315315
#if SOC_PM_SUPPORT_PMU_MODEM_STATE && CONFIG_ESP_WIFI_ENHANCED_LIGHT_SLEEP
316+
extern void pm_mac_modem_clear_rf_power_state(void);
317+
pm_mac_modem_clear_rf_power_state();
316318
if (sleep_modem_wifi_modem_state_enabled()) {
317319
sleep_modem_wifi_do_phy_retention(false);
318320
} else

components/esp_rom/esp32c2/ld/esp32c2.rom.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1457,7 +1457,7 @@ ppGetTxframe = 0x40001bf8;
14571457
ppMapTxQueue = 0x40001bfc;
14581458
ppProcTxSecFrame = 0x40001c00;
14591459
ppProcessRxPktHdr = 0x40001c04;
1460-
ppProcessTxQ = 0x40001c08;
1460+
/*ppProcessTxQ = 0x40001c08;*/
14611461
ppRecordBarRRC = 0x40001c0c;
14621462
lmacRequestTxopQueue = 0x40001c10;
14631463
lmacReleaseTxopQueue = 0x40001c14;

components/esp_rom/esp32c3/ld/esp32c3.rom.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1571,7 +1571,7 @@ ppEnqueueTxDone = 0x400016cc;
15711571
ppGetTxQFirstAvail_Locked = 0x400016d0;
15721572
ppGetTxframe = 0x400016d4;
15731573
ppProcessRxPktHdr = 0x400016e0;
1574-
ppProcessTxQ = 0x400016e4;
1574+
/*ppProcessTxQ = 0x400016e4;*/
15751575
ppRecordBarRRC = 0x400016e8;
15761576
lmacRequestTxopQueue = 0x400016ec;
15771577
lmacReleaseTxopQueue = 0x400016f0;

components/esp_rom/esp32c5/mp/esp32c5/ld/esp32c5.rom.pp.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ ppGetTxframe = 0x40000e60;
180180
ppMapTxQueue = 0x40000e64;
181181
ppProcTxSecFrame = 0x40000e68;
182182
ppProcessRxPktHdr = 0x40000e6c;
183-
ppProcessTxQ = 0x40000e70;
183+
/*ppProcessTxQ = 0x40000e70;*/
184184
ppRecordBarRRC = 0x40000e74;
185185
ppRecycleAmpdu = 0x40000e78;
186186
ppRecycleRxPkt = 0x40000e7c;

components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ ppGetTxframe = 0x40000c14;
9393
ppMapTxQueue = 0x40000c18;
9494
ppProcTxSecFrame = 0x40000c1c;
9595
ppProcessRxPktHdr = 0x40000c20;
96-
ppProcessTxQ = 0x40000c24;
96+
/*ppProcessTxQ = 0x40000c24;*/
9797
ppRecordBarRRC = 0x40000c28;
9898
ppRecycleAmpdu = 0x40000c2c;
9999
ppRecycleRxPkt = 0x40000c30;

components/esp_rom/esp32s3/ld/esp32s3.rom.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1851,7 +1851,7 @@ ppGetTxQFirstAvail_Locked = 0x400055b0;
18511851
ppGetTxframe = 0x400055bc;
18521852
/*ppMapTxQueue = 0x400055c8;*/
18531853
ppProcessRxPktHdr = 0x400055e0;
1854-
ppProcessTxQ = 0x400055ec;
1854+
/*ppProcessTxQ = 0x400055ec;*/
18551855
ppRecordBarRRC = 0x400055f8;
18561856
lmacRequestTxopQueue = 0x40005604;
18571857
lmacReleaseTxopQueue = 0x40005610;

0 commit comments

Comments
 (0)