espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 19:24:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/wps_disable_disconnect_v4.4' into 'release/v4.4'

Browse Source 
WiFi: Do not disconnect in WPS disable API incase WPS is done/scanning (v4.4)

See merge request espressif/esp-idf!19148
This commit is contained in:
Jiang Jiang Jian
2022-07-22 15:13:54 +08:00
parent f0a3ccc732 f42fd4236c
commit 145c3cd000
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/wpa_supplicant/esp_supplicant/src/esp_wps.c
View File

@@ -2153,6 +2153,7 @@ int wifi_wps_disable_internal(void)
int esp_wifi_wps_disable(void) int esp_wifi_wps_disable(void)
{ {
int ret = 0; int ret = 0;
int wps_status;
if (ESP_OK != wps_check_wifi_mode()) { if (ESP_OK != wps_check_wifi_mode()) {
return ESP_ERR_WIFI_MODE; return ESP_ERR_WIFI_MODE;
@@ -2166,7 +2167,8 @@ int esp_wifi_wps_disable(void)
return ESP_OK; return ESP_OK;
} }
wpa_printf(MSG_INFO, "wifi_wps_disable\n"); wps_status = wps_get_status();
wpa_printf(MSG_INFO, "wifi_wps_disable");
wps_set_type(WPS_TYPE_DISABLE); /* Notify WiFi task */ wps_set_type(WPS_TYPE_DISABLE); /* Notify WiFi task */
/* Call wps_delete_timer to delete all WPS timer, no timer will call wps_post() /* Call wps_delete_timer to delete all WPS timer, no timer will call wps_post()
@@ -2184,7 +2186,10 @@ int esp_wifi_wps_disable(void)
wpa_printf(MSG_ERROR, "wps disable: failed to disable wps, ret=%d", ret); wpa_printf(MSG_ERROR, "wps disable: failed to disable wps, ret=%d", ret);
} }
esp_wifi_disconnect(); /* Only disconnect in case of WPS pending */
if (wps_status == WPS_STATUS_PENDING) {
esp_wifi_disconnect();
}
esp_wifi_set_wps_start_flag_internal(false); esp_wifi_set_wps_start_flag_internal(false);
wps_task_deinit(); wps_task_deinit();
s_wps_enabled = false; s_wps_enabled = false;