espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

wpa_supplicant: Optimize BTM request scan

Browse Source
This commit is contained in:
Kapil Gupta
2021-10-28 14:23:34 +05:30
parent 0c8fb540b2
commit 9d174e7944
2 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,10 @@ void wpa_supplicant_req_scan(struct wpa_supplicant *wpa_s, int sec, int usec)
} }
params = os_zalloc(sizeof(*params)); params = os_zalloc(sizeof(*params));
if (!params) {
wpa_printf(MSG_ERROR, "Memory allocation failed");
return;
}
if (wpa_s->wnm_mode) { if (wpa_s->wnm_mode) {
/* Use the same memory */ /* Use the same memory */
params->ssids[0].ssid = wpa_s->current_bss->ssid; params->ssids[0].ssid = wpa_s->current_bss->ssid;

29
components/wpa_supplicant/src/common/wnm_sta.c
View File

@ -470,15 +470,15 @@ static void wnm_send_bss_transition_mgmt_resp(
struct wpabuf *buf; struct wpabuf *buf;
int res; int res;
wpa_printf(MSG_DEBUG,
"WNM: Send BSS Transition Management Response to " MACSTR
" dialog_token=%u status=%u reason=%u delay=%d",
MAC2STR(wpa_s->current_bss->bssid), dialog_token, status, reason, delay);
if (!wpa_s->current_bss) { if (!wpa_s->current_bss) {
wpa_printf(MSG_DEBUG, wpa_printf(MSG_DEBUG,
"WNM: Current BSS not known - drop response"); "WNM: Current BSS not known - drop response");
return; return;
} }
wpa_printf(MSG_DEBUG,
"WNM: Send BSS Transition Management Response to " MACSTR
" dialog_token=%u status=%u reason=%u delay=%d",
MAC2STR(wpa_s->current_bss->bssid), dialog_token, status, reason, delay);
buf = wpabuf_alloc(BTM_RESP_MIN_SIZE); buf = wpabuf_alloc(BTM_RESP_MIN_SIZE);
if (!buf) { if (!buf) {
@ -653,7 +653,7 @@ static void wnm_dump_cand_list(struct wpa_supplicant *wpa_s)
static void wnm_set_scan_freqs(struct wpa_supplicant *wpa_s) static void wnm_set_scan_freqs(struct wpa_supplicant *wpa_s)
{ {
unsigned int i; unsigned int i;
int num_chan; int num_chan = 0;
u8 chan = 0; u8 chan = 0;
wpa_s->next_scan_chan = 0; wpa_s->next_scan_chan = 0;
@ -671,8 +671,10 @@ static void wnm_set_scan_freqs(struct wpa_supplicant *wpa_s)
MAC2STR(nei->bssid)); MAC2STR(nei->bssid));
return; return;
} }
if (nei->channel_number != chan) if (nei->channel_number != chan) {
chan = nei->channel_number;
num_chan++; num_chan++;
}
} }
if (num_chan == 1) { if (num_chan == 1) {
@ -692,6 +694,9 @@ static void ieee802_11_rx_bss_trans_mgmt_req(struct wpa_supplicant *wpa_s,
{ {
unsigned int beacon_int; unsigned int beacon_int;
u8 valid_int; u8 valid_int;
#ifdef ESP_SUPPLICANT
bool scan_required = false;
#endif
if (wpa_s->disable_btm) if (wpa_s->disable_btm)
return; return;
@ -757,9 +762,11 @@ static void ieee802_11_rx_bss_trans_mgmt_req(struct wpa_supplicant *wpa_s,
#ifdef ESP_SUPPLICANT #ifdef ESP_SUPPLICANT
os_memset(wpa_s->next_scan_bssid, 0, ETH_ALEN); os_memset(wpa_s->next_scan_bssid, 0, ETH_ALEN);
wpa_s->next_scan_chan = 0; wpa_s->next_scan_chan = 0;
#endif scan_required = true;
#else
wpa_printf(MSG_DEBUG, "Trying to find another BSS"); wpa_printf(MSG_DEBUG, "Trying to find another BSS");
wpa_supplicant_req_scan(wpa_s, 0, 0); wpa_supplicant_req_scan(wpa_s, 0, 0);
#endif
} }
} }
@ -871,6 +878,12 @@ static void ieee802_11_rx_bss_trans_mgmt_req(struct wpa_supplicant *wpa_s,
"WNM: Scan only for a specific BSSID since there is only a single candidate " "WNM: Scan only for a specific BSSID since there is only a single candidate "
MACSTR, MAC2STR(wpa_s->next_scan_bssid)); MACSTR, MAC2STR(wpa_s->next_scan_bssid));
} }
#ifdef ESP_SUPPLICANT
scan_required = true;
}
if (scan_required) {
wpa_printf(MSG_DEBUG, "Trying to find another BSS");
#endif
wpa_supplicant_req_scan(wpa_s, 0, 0); wpa_supplicant_req_scan(wpa_s, 0, 0);
} else if (reply) { } else if (reply) {
enum bss_trans_mgmt_status_code status; enum bss_trans_mgmt_status_code status;
@ -961,7 +974,7 @@ void ieee802_11_rx_wnm_action(struct wpa_supplicant *wpa_s,
switch (act) { switch (act) {
case WNM_BSS_TRANS_MGMT_REQ: case WNM_BSS_TRANS_MGMT_REQ:
ieee802_11_rx_bss_trans_mgmt_req(wpa_s, pos, end, ieee802_11_rx_bss_trans_mgmt_req(wpa_s, pos, end,
!(sender[0] & 0x01)); 0x01);
break; break;
default: default:
wpa_printf(MSG_ERROR, "WNM: Unknown request"); wpa_printf(MSG_ERROR, "WNM: Unknown request");