alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/minor_syntax_changes_v5.0' into 'release/v5.0'

Browse Source 
wpa_supplicant : Fixing a collection of issues encountered during application testing.

See merge request espressif/esp-idf!22178
This commit is contained in:
Jiang Jiang Jian 2023-03-17 19:39:49 +08:00
commit e9b2f6ddce
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/wpa_supplicant/esp_supplicant/src/esp_common.c
View File

@ -171,8 +171,10 @@ static void clear_bssid_flag(struct wpa_supplicant *wpa_s)
}
esp_wifi_get_config(WIFI_IF_STA, config);
config->sta.bssid_set = 0;
esp_wifi_set_config(WIFI_IF_STA, config);
if (config->sta.bssid_set) {
config->sta.bssid_set = 0;
esp_wifi_set_config(WIFI_IF_STA, config);
}
os_free(config);
wpa_printf(MSG_DEBUG, "cleared bssid flag");
}

2
components/wpa_supplicant/esp_supplicant/src/esp_scan.c
View File

@ -95,6 +95,7 @@ void esp_scan_init(struct wpa_supplicant *wpa_s)
wpa_s->scanning = 0;
wpa_bss_init(wpa_s);
wpa_s->last_scan_res = NULL;
wpa_s->last_scan_res_used = 0;
}
void esp_scan_deinit(struct wpa_supplicant *wpa_s)
@ -102,6 +103,7 @@ void esp_scan_deinit(struct wpa_supplicant *wpa_s)
wpa_bss_deinit(wpa_s);
os_free(wpa_s->last_scan_res);
wpa_s->last_scan_res = NULL;
wpa_s->last_scan_res_used = 0;
}
int esp_handle_beacon_probe(u8 type, u8 *frame, size_t len, u8 *sender,

4
components/wpa_supplicant/src/common/wpa_common.c
View File

@ -270,7 +270,7 @@ static int rsn_selector_to_bitfield(const u8 *s)
return WPA_CIPHER_CCMP;
if (RSN_SELECTOR_GET(s) == RSN_CIPHER_SUITE_WEP104)
return WPA_CIPHER_WEP104;
#ifdef COFIG_GCMP
#ifdef CONFIG_GCMP
if (RSN_SELECTOR_GET(s) == RSN_CIPHER_SUITE_GCMP)
return WPA_CIPHER_GCMP;
if (RSN_SELECTOR_GET(s) == RSN_CIPHER_SUITE_GCMP_256)
@ -279,7 +279,7 @@ static int rsn_selector_to_bitfield(const u8 *s)
#ifdef CONFIG_IEEE80211W
if (RSN_SELECTOR_GET(s) == RSN_CIPHER_SUITE_AES_128_CMAC)
return WPA_CIPHER_AES_128_CMAC;
#ifdef COFIG_GMAC
#ifdef CONFIG_GMAC
if (RSN_SELECTOR_GET(s) == RSN_CIPHER_SUITE_BIP_GMAC_128)
return WPA_CIPHER_BIP_GMAC_128;
if (RSN_SELECTOR_GET(s) == RSN_CIPHER_SUITE_BIP_GMAC_256)