From 721fe216e7d1a14542e1b4dc3e1d863dd14ff947 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Thu, 8 Jul 2021 10:29:30 +0800 Subject: [PATCH 1/3] wpa_supplicant: Fix wps_free_pins to remove all pins Current code does not correctly free all pins in wps_free_pins due to the semicolon at the end of dl_list_for_each_safe(). Fix it. Signed-off-by: Axel Lin --- components/wpa_supplicant/src/wps/wps_registrar.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/wpa_supplicant/src/wps/wps_registrar.c b/components/wpa_supplicant/src/wps/wps_registrar.c index 2a13b3bbb3..3d22a5eb5c 100644 --- a/components/wpa_supplicant/src/wps/wps_registrar.c +++ b/components/wpa_supplicant/src/wps/wps_registrar.c @@ -101,8 +101,8 @@ static void wps_remove_pin(struct wps_uuid_pin *pin) static void wps_free_pins(struct dl_list *pins) { struct wps_uuid_pin *pin, *prev; - dl_list_for_each_safe(pin, prev, pins, struct wps_uuid_pin, list); - wps_remove_pin(pin); + dl_list_for_each_safe(pin, prev, pins, struct wps_uuid_pin, list) + wps_remove_pin(pin); } #endif From a249794640b46730acecf95f3e2252903b33dbb9 Mon Sep 17 00:00:00 2001 From: xiehang Date: Fri, 19 Mar 2021 15:29:07 +0800 Subject: [PATCH 2/3] esp_wifi: Add beacon timeout event --- components/esp_event/event_send.c | 3 +++ components/esp_event/include/esp_event_legacy.h | 1 + components/esp_wifi/include/esp_wifi_types.h | 1 + 3 files changed, 5 insertions(+) diff --git a/components/esp_event/event_send.c b/components/esp_event/event_send.c index 80fe464a81..79a450860e 100644 --- a/components/esp_event/event_send.c +++ b/components/esp_event/event_send.c @@ -82,6 +82,9 @@ static system_event_id_t esp_event_legacy_wifi_event_id(int32_t event_id) case WIFI_EVENT_AP_PROBEREQRECVED: return SYSTEM_EVENT_AP_PROBEREQRECVED; + case WIFI_EVENT_STA_BEACON_TIMEOUT: + return SYSTEM_EVENT_STA_BEACON_TIMEOUT; + default: ESP_LOGE(TAG, "invalid wifi event id %d", event_id); return SYSTEM_EVENT_MAX; diff --git a/components/esp_event/include/esp_event_legacy.h b/components/esp_event/include/esp_event_legacy.h index ba74ec776c..92957a82e1 100644 --- a/components/esp_event/include/esp_event_legacy.h +++ b/components/esp_event/include/esp_event_legacy.h @@ -47,6 +47,7 @@ typedef enum { SYSTEM_EVENT_AP_STADISCONNECTED, /*!< a station disconnected from ESP32 soft-AP */ SYSTEM_EVENT_AP_STAIPASSIGNED, /*!< ESP32 soft-AP assign an IP to a connected station */ SYSTEM_EVENT_AP_PROBEREQRECVED, /*!< Receive probe request packet in soft-AP interface */ + SYSTEM_EVENT_STA_BEACON_TIMEOUT, /*!< ESP32 station beacon timeout */ SYSTEM_EVENT_GOT_IP6, /*!< ESP32 station or ap or ethernet interface v6IP addr is preferred */ SYSTEM_EVENT_ETH_START, /*!< ESP32 ethernet start */ SYSTEM_EVENT_ETH_STOP, /*!< ESP32 ethernet stop */ diff --git a/components/esp_wifi/include/esp_wifi_types.h b/components/esp_wifi/include/esp_wifi_types.h index ae92443593..244f6089be 100644 --- a/components/esp_wifi/include/esp_wifi_types.h +++ b/components/esp_wifi/include/esp_wifi_types.h @@ -519,6 +519,7 @@ typedef enum { WIFI_EVENT_STA_CONNECTED, /**< ESP32 station connected to AP */ WIFI_EVENT_STA_DISCONNECTED, /**< ESP32 station disconnected from AP */ WIFI_EVENT_STA_AUTHMODE_CHANGE, /**< the auth mode of AP connected by ESP32 station changed */ + WIFI_EVENT_STA_BEACON_TIMEOUT, /**< ESP32 station beacon timeout */ WIFI_EVENT_STA_WPS_ER_SUCCESS, /**< ESP32 station wps succeeds in enrollee mode */ WIFI_EVENT_STA_WPS_ER_FAILED, /**< ESP32 station wps fails in enrollee mode */ From aa5e034c52aa85edefd0684621ab2cbf6a778ef6 Mon Sep 17 00:00:00 2001 From: zhangyanjiao Date: Fri, 3 Dec 2021 17:58:35 +0800 Subject: [PATCH 3/3] eps_wifi: 1. Fix airkiss and esptouch find channel crash issue 2. Fix RF singal test without 9M rate issue 3. Fix issue of setting invalid size to nvs misc log even after erasing it 4. Fix WEP connection and crash issue --- components/esp_wifi/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index fbcdc77c26..ebad769a24 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit fbcdc77c26eb0d716927c8bc7d73dbec9a8987c1 +Subproject commit ebad769a24418ac1fc3c5d585b1dddecee7852f7