espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-03 12:44:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_wifi_bugs_241122_v5.2' into 'release/v5.2'

Browse Source 
bugfix: fix some wifi bugs 241122 v5.2

See merge request espressif/esp-idf!35130
This commit is contained in:
Jiang Jiang Jian
2024-11-26 14:50:29 +08:00
parent 6e07162da2 e89948ddbe
commit 9a9a813774
7 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_rom/esp32c2/ld/esp32c2.rom.ld
View File

@@ -633,7 +633,7 @@ ppGetTxframe = 0x40001bf8;
ppMapTxQueue = 0x40001bfc; ppMapTxQueue = 0x40001bfc;
ppProcTxSecFrame = 0x40001c00; ppProcTxSecFrame = 0x40001c00;
ppProcessRxPktHdr = 0x40001c04; ppProcessRxPktHdr = 0x40001c04;
ppProcessTxQ = 0x40001c08; /*ppProcessTxQ = 0x40001c08;*/
ppRecordBarRRC = 0x40001c0c; ppRecordBarRRC = 0x40001c0c;
lmacRequestTxopQueue = 0x40001c10; lmacRequestTxopQueue = 0x40001c10;
lmacReleaseTxopQueue = 0x40001c14; lmacReleaseTxopQueue = 0x40001c14;

2
components/esp_rom/esp32c3/ld/esp32c3.rom.ld
View File

@@ -745,7 +745,7 @@ ppEnqueueTxDone = 0x400016cc;
ppGetTxQFirstAvail_Locked = 0x400016d0; ppGetTxQFirstAvail_Locked = 0x400016d0;
ppGetTxframe = 0x400016d4; ppGetTxframe = 0x400016d4;
ppProcessRxPktHdr = 0x400016e0; ppProcessRxPktHdr = 0x400016e0;
ppProcessTxQ = 0x400016e4; /*ppProcessTxQ = 0x400016e4;*/
ppRecordBarRRC = 0x400016e8; ppRecordBarRRC = 0x400016e8;
lmacRequestTxopQueue = 0x400016ec; lmacRequestTxopQueue = 0x400016ec;
lmacReleaseTxopQueue = 0x400016f0; lmacReleaseTxopQueue = 0x400016f0;

2
components/esp_rom/esp32s3/ld/esp32s3.rom.ld
View File

@@ -1023,7 +1023,7 @@ ppGetTxQFirstAvail_Locked = 0x400055b0;
ppGetTxframe = 0x400055bc; ppGetTxframe = 0x400055bc;
/*ppMapTxQueue = 0x400055c8;*/ /*ppMapTxQueue = 0x400055c8;*/
ppProcessRxPktHdr = 0x400055e0; ppProcessRxPktHdr = 0x400055e0;
ppProcessTxQ = 0x400055ec; /*ppProcessTxQ = 0x400055ec;*/
ppRecordBarRRC = 0x400055f8; ppRecordBarRRC = 0x400055f8;
lmacRequestTxopQueue = 0x40005604; lmacRequestTxopQueue = 0x40005604;
lmacReleaseTxopQueue = 0x40005610; lmacReleaseTxopQueue = 0x40005610;

2
components/esp_wifi/lib

Submodule components/esp_wifi/lib updated: 172c1c5072...c3542aed20

1
components/wpa_supplicant/esp_supplicant/src/esp_wifi_driver.h
View File

@@ -141,6 +141,7 @@ struct wpa_funcs {
void (*wpa_config_done)(void); void (*wpa_config_done)(void);
uint8_t *(*owe_build_dhie)(uint16_t group); uint8_t *(*owe_build_dhie)(uint16_t group);
int (*owe_process_assoc_resp)(const u8 *rsn_ie, size_t rsn_len, const uint8_t *dh_ie, size_t dh_len); int (*owe_process_assoc_resp)(const u8 *rsn_ie, size_t rsn_len, const uint8_t *dh_ie, size_t dh_len);
void (*wpa_sta_clear_curr_pmksa)(void);
}; };
struct wpa2_funcs { struct wpa2_funcs {

1
components/wpa_supplicant/esp_supplicant/src/esp_wpa_main.c
View File

@@ -441,6 +441,7 @@ int esp_supplicant_init(void)
wpa_cb->wpa_config_bss = NULL;//wpa_config_bss; wpa_cb->wpa_config_bss = NULL;//wpa_config_bss;
wpa_cb->wpa_michael_mic_failure = wpa_michael_mic_failure; wpa_cb->wpa_michael_mic_failure = wpa_michael_mic_failure;
wpa_cb->wpa_config_done = wpa_config_done; wpa_cb->wpa_config_done = wpa_config_done;
wpa_cb->wpa_sta_clear_curr_pmksa = wpa_sta_clear_curr_pmksa;
esp_wifi_register_wpa3_ap_cb(wpa_cb); esp_wifi_register_wpa3_ap_cb(wpa_cb);
esp_wifi_register_wpa3_cb(wpa_cb); esp_wifi_register_wpa3_cb(wpa_cb);

4
examples/wifi/power_save/pytest_wifi_power_save.py
View File

@@ -9,7 +9,7 @@ from common_test_methods import get_env_config_variable
from pytest_embedded import Dut from pytest_embedded import Dut
bad_event_str = [ bad_event_str = [
'bcn_timout', 'bcn_timeout',
'm f probe req l', 'm f probe req l',
'abort() was called', 'abort() was called',
'Guru Meditation Error', 'Guru Meditation Error',
@@ -31,7 +31,7 @@ def _run_test(dut: Dut) -> None:
pass pass
try: try:
dut.expect(r'got ip: (\d+\.\d+\.\d+\.\d+)[^\d]', timeout=20) dut.expect(r'got ip: (\d+\.\d+\.\d+\.\d+)[^\d]', timeout=30)
log_after_got_ip = dut.expect(pexpect.TIMEOUT, timeout=10).decode() log_after_got_ip = dut.expect(pexpect.TIMEOUT, timeout=10).decode()
if any(s in log_after_got_ip for s in bad_event_str): if any(s in log_after_got_ip for s in bad_event_str):
logging.info('Abnormal connection log:') logging.info('Abnormal connection log:')