espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-09-09 14:51:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_wifi_bugs_241126_v5.1' into 'release/v5.1'

Browse Source 
bugfix: fix some wifi issues 241126 v5.1

See merge request espressif/esp-idf!35224
This commit is contained in:
Jiang Jiang Jian
2024-11-29 20:29:29 +08:00
parent ea5c51cbfa ee099bda6c
commit 0dbc947c2b
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_wifi/lib

Submodule components/esp_wifi/lib updated: 7443c5639e...d985b57105

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

@@ -142,6 +142,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

@@ -442,6 +442,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);

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

@@ -1,6 +1,5 @@
# SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD # SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
import logging import logging
import pexpect import pexpect
@@ -9,7 +8,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 +30,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:')