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

Prevent pmk flush for unspecified reasoncode (v4.4)

See merge request espressif/esp-idf!20583
This commit is contained in:
Jiang Jiang Jian 2022-11-09 17:53:05 +08:00
commit 879102ab1f
2 changed files with 0 additions and 6 deletions

View File

@ -215,16 +215,11 @@ static void supplicant_sta_disconn_handler(void* arg, esp_event_base_t event_bas
int32_t event_id, void* event_data) int32_t event_id, void* event_data)
{ {
struct wpa_supplicant *wpa_s = &g_wpa_supp; struct wpa_supplicant *wpa_s = &g_wpa_supp;
wifi_event_sta_disconnected_t *disconn = event_data;
wpas_rrm_reset(wpa_s); wpas_rrm_reset(wpa_s);
if (wpa_s->current_bss) { if (wpa_s->current_bss) {
wpa_s->current_bss = NULL; wpa_s->current_bss = NULL;
} }
if (disconn->reason != WIFI_REASON_ROAMING) {
clear_bssid_flag(wpa_s);
}
} }
static int ieee80211_handle_rx_frm(u8 type, u8 *frame, size_t len, u8 *sender, static int ieee80211_handle_rx_frm(u8 type, u8 *frame, size_t len, u8 *sender,

View File

@ -206,7 +206,6 @@ int wpa_parse_wpa_ie_wrapper(const u8 *wpa_ie, size_t wpa_ie_len, wifi_wpa_ie_t
static void wpa_sta_disconnected_cb(uint8_t reason_code) static void wpa_sta_disconnected_cb(uint8_t reason_code)
{ {
switch (reason_code) { switch (reason_code) {
case WIFI_REASON_UNSPECIFIED:
case WIFI_REASON_AUTH_EXPIRE: case WIFI_REASON_AUTH_EXPIRE:
case WIFI_REASON_NOT_AUTHED: case WIFI_REASON_NOT_AUTHED:
case WIFI_REASON_NOT_ASSOCED: case WIFI_REASON_NOT_ASSOCED: