mirror of
https://github.com/espressif/esp-idf.git
synced 2024-10-05 20:47:46 -04:00
Merge branch 'bugfix/config_sae_compile_error_v5.2' into 'release/v5.2'
fix(wpa_supplicant): Compile error when CONFIG_SAE is disabled (v5.2) See merge request espressif/esp-idf!30177
This commit is contained in:
commit
d2fb80529c
@ -325,9 +325,12 @@ static bool hostap_sta_join(void **sta, u8 *bssid, u8 *wpa_ie, u8 wpa_ie_len,u8
|
|||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
#endif /* CONFIG_SAE */
|
||||||
if (!esp_wifi_ap_is_sta_sae_reauth_node(bssid)) {
|
if (!esp_wifi_ap_is_sta_sae_reauth_node(bssid)) {
|
||||||
ap_free_sta(hapd, old_sta);
|
ap_free_sta(hapd, old_sta);
|
||||||
} else if (old_sta && old_sta->lock) {
|
}
|
||||||
|
#ifdef CONFIG_SAE
|
||||||
|
else if (old_sta && old_sta->lock) {
|
||||||
sta_info = old_sta;
|
sta_info = old_sta;
|
||||||
goto process_old_sta;
|
goto process_old_sta;
|
||||||
}
|
}
|
||||||
@ -350,9 +353,10 @@ static bool hostap_sta_join(void **sta, u8 *bssid, u8 *wpa_ie, u8 wpa_ie_len,u8
|
|||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_SAE */
|
|
||||||
|
|
||||||
process_old_sta:
|
process_old_sta:
|
||||||
|
#endif /* CONFIG_SAE */
|
||||||
|
|
||||||
|
|
||||||
#ifdef CONFIG_WPS_REGISTRAR
|
#ifdef CONFIG_WPS_REGISTRAR
|
||||||
if (check_n_add_wps_sta(hapd, sta_info, wpa_ie, wpa_ie_len, pmf_enable, subtype) == 0) {
|
if (check_n_add_wps_sta(hapd, sta_info, wpa_ie, wpa_ie_len, pmf_enable, subtype) == 0) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user