feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/bugfix/wpa_supplicant_fixes_v4.3' into 'release/v4.3'

Browse Source 
Merge wpa_supplicant github PRs (V4.3)

See merge request espressif/esp-idf!14751
This commit is contained in:
Jiang Jiang Jian
2021-08-12 09:02:42 +00:00
parent 6a13a9d0c4 af03dcb037
commit 48ae2309fd
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -177,7 +177,7 @@ static void esp_clear_bssid_flag(struct wpa_supplicant *wpa_s)
static void esp_register_action_frame(struct wpa_supplicant *wpa_s) static void esp_register_action_frame(struct wpa_supplicant *wpa_s)
{ {
wpa_s->type &= ~WLAN_FC_STYPE_ACTION; wpa_s->type &= ~(1 << WLAN_FC_STYPE_ACTION);
/* subtype is defined only for action frame */ /* subtype is defined only for action frame */
wpa_s->subtype = 0; wpa_s->subtype = 0;
@@ -281,9 +281,7 @@ int esp_rrm_send_neighbor_rep_request(neighbor_rep_request_cb cb,
struct wifi_ssid *ssid = esp_wifi_sta_get_prof_ssid_internal(); struct wifi_ssid *ssid = esp_wifi_sta_get_prof_ssid_internal();
os_memcpy(wpa_ssid.ssid, ssid->ssid, ssid->len); os_memcpy(wpa_ssid.ssid, ssid->ssid, ssid->len);
wpa_ssid.ssid_len = ssid->len; wpa_ssid.ssid_len = ssid->len;
wpas_rrm_send_neighbor_rep_request(wpa_s, &wpa_ssid, 0, 0, cb, cb_ctx); return wpas_rrm_send_neighbor_rep_request(wpa_s, &wpa_ssid, 0, 0, cb, cb_ctx);
return 0;
} }
int esp_wnm_send_bss_transition_mgmt_query(enum btm_query_reason query_reason, int esp_wnm_send_bss_transition_mgmt_query(enum btm_query_reason query_reason,

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

@@ -90,7 +90,7 @@ void *hostap_init(void)
spp_attrubute = esp_wifi_get_spp_attrubute_internal(WIFI_IF_AP); spp_attrubute = esp_wifi_get_spp_attrubute_internal(WIFI_IF_AP);
auth_conf->spp_sup.capable = ((spp_attrubute & WPA_CAPABILITY_SPP_CAPABLE) ? SPP_AMSDU_CAP_ENABLE : SPP_AMSDU_CAP_DISABLE); auth_conf->spp_sup.capable = ((spp_attrubute & WPA_CAPABILITY_SPP_CAPABLE) ? SPP_AMSDU_CAP_ENABLE : SPP_AMSDU_CAP_DISABLE);
auth_conf->spp_sup.require = ((spp_attrubute & WPA_CAPABILITY_SPP_REQUIRED) ? SPP_AMSDU_CAP_ENABLE : SPP_AMSDU_REQ_DISABLE); auth_conf->spp_sup.require = ((spp_attrubute & WPA_CAPABILITY_SPP_REQUIRED) ? SPP_AMSDU_REQ_ENABLE : SPP_AMSDU_REQ_DISABLE);
memcpy(hapd->conf->ssid.ssid, ssid->ssid, ssid->len); memcpy(hapd->conf->ssid.ssid, ssid->ssid, ssid->len);
hapd->conf->ssid.ssid_len = ssid->len; hapd->conf->ssid.ssid_len = ssid->len;

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

@@ -199,7 +199,8 @@ static int esp_issue_scan(struct wpa_supplicant *wpa_s,
params->ssid = os_zalloc(scan_params->ssids[0].ssid_len + 1); params->ssid = os_zalloc(scan_params->ssids[0].ssid_len + 1);
if (!params->ssid) { if (!params->ssid) {
wpa_printf(MSG_ERROR, "failed to allocate memory"); wpa_printf(MSG_ERROR, "failed to allocate memory");
return -1; ret = -1;
goto cleanup;
} }
os_memcpy(params->ssid, scan_params->ssids[0].ssid, scan_params->ssids[0].ssid_len); os_memcpy(params->ssid, scan_params->ssids[0].ssid, scan_params->ssids[0].ssid_len);
params->scan_type = WIFI_SCAN_TYPE_ACTIVE; params->scan_type = WIFI_SCAN_TYPE_ACTIVE;
@@ -210,7 +211,8 @@ static int esp_issue_scan(struct wpa_supplicant *wpa_s,
params->bssid = os_zalloc(ETH_ALEN); params->bssid = os_zalloc(ETH_ALEN);
if (!params->bssid) { if (!params->bssid) {
wpa_printf(MSG_ERROR, "failed to allocate memory"); wpa_printf(MSG_ERROR, "failed to allocate memory");
return -1; ret = -1;
goto cleanup;
} }
os_memcpy(params->bssid, scan_params->bssid, ETH_ALEN); os_memcpy(params->bssid, scan_params->bssid, ETH_ALEN);
} }

2
components/wpa_supplicant/src/rsn_supp/wpa.c
View File

@@ -2081,7 +2081,7 @@ bool wpa_sm_init(char * payload, WPA_SEND_FUNC snd_func,
spp_attrubute = esp_wifi_get_spp_attrubute_internal(WIFI_IF_STA); spp_attrubute = esp_wifi_get_spp_attrubute_internal(WIFI_IF_STA);
sm->spp_sup.capable = ((spp_attrubute & WPA_CAPABILITY_SPP_CAPABLE) ? SPP_AMSDU_CAP_ENABLE : SPP_AMSDU_CAP_DISABLE); sm->spp_sup.capable = ((spp_attrubute & WPA_CAPABILITY_SPP_CAPABLE) ? SPP_AMSDU_CAP_ENABLE : SPP_AMSDU_CAP_DISABLE);
sm->spp_sup.require = ((spp_attrubute & WPA_CAPABILITY_SPP_REQUIRED) ? SPP_AMSDU_CAP_ENABLE : SPP_AMSDU_REQ_DISABLE); sm->spp_sup.require = ((spp_attrubute & WPA_CAPABILITY_SPP_REQUIRED) ? SPP_AMSDU_REQ_ENABLE : SPP_AMSDU_REQ_DISABLE);
wpa_sm_set_state(WPA_INACTIVE); wpa_sm_set_state(WPA_INACTIVE);