diff options
| author | Jouni Malinen <jouni@qca.qualcomm.com> | 2016-02-26 17:16:35 +0200 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-05-02 01:04:58 -0700 |
| commit | cd86cc13e3b8389519e2e2ee7e245421089bfa69 (patch) | |
| tree | 7fe40af18eec10a6998152ea03ad10cce7d51d3f | |
| parent | 1d7cbb7988fc4778a4ee245e9ea3d72f220ae4b7 (diff) | |
| download | android_external_wpa_supplicant_8-cd86cc13e3b8389519e2e2ee7e245421089bfa69.tar.gz android_external_wpa_supplicant_8-cd86cc13e3b8389519e2e2ee7e245421089bfa69.tar.bz2 android_external_wpa_supplicant_8-cd86cc13e3b8389519e2e2ee7e245421089bfa69.zip | |
WNM: Optimize a single BSS transition management candidate scan
If the BSS Transition Management Request frame includes only a single
candidate and we need to scan for the BSS to get up-to-date information,
use a scan for the known BSSID instead of wildcard BSSID. In addition,
set the SSID in the scan if it is known based on old scan results in the
BSS table. This removes unnecessary Probe Response frames when we are
interested in results from only a single BSS.
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Git-commit: 0645492e7c98441d230b787c5711b4e4b337655b
Git-repo: git://w1.fi/srv/git/hostap.git
Change-Id: I5c8ef7e1023e782cd7d18e0294dd3f84564a4c1a
CRs-Fixed: 996616
| -rw-r--r-- | wpa_supplicant/scan.c | 23 | ||||
| -rw-r--r-- | wpa_supplicant/wnm_sta.c | 8 | ||||
| -rw-r--r-- | wpa_supplicant/wpa_supplicant_i.h | 1 |
3 files changed, 32 insertions, 0 deletions
diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c index e8c5354d..f706aefc 100644 --- a/wpa_supplicant/scan.c +++ b/wpa_supplicant/scan.c @@ -1013,6 +1013,27 @@ ssid_list_set: } } + if (!is_zero_ether_addr(wpa_s->next_scan_bssid)) { + struct wpa_bss *bss; + + params.bssid = wpa_s->next_scan_bssid; + bss = wpa_bss_get_bssid_latest(wpa_s, params.bssid); + if (bss && bss->ssid_len && params.num_ssids == 1 && + params.ssids[0].ssid_len == 0) { + params.ssids[0].ssid = bss->ssid; + params.ssids[0].ssid_len = bss->ssid_len; + wpa_dbg(wpa_s, MSG_DEBUG, + "Scan a previously specified BSSID " MACSTR + " and SSID %s", + MAC2STR(params.bssid), + wpa_ssid_txt(bss->ssid, bss->ssid_len)); + } else { + wpa_dbg(wpa_s, MSG_DEBUG, + "Scan a previously specified BSSID " MACSTR, + MAC2STR(params.bssid)); + } + } + scan_params = ¶ms; scan: @@ -1073,6 +1094,8 @@ scan: #ifdef CONFIG_INTERWORKING wpa_s->interworking_fast_assoc_tried = 0; #endif /* CONFIG_INTERWORKING */ + if (params.bssid) + os_memset(wpa_s->next_scan_bssid, 0, ETH_ALEN); } } diff --git a/wpa_supplicant/wnm_sta.c b/wpa_supplicant/wnm_sta.c index cec457d1..ae4a1684 100644 --- a/wpa_supplicant/wnm_sta.c +++ b/wpa_supplicant/wnm_sta.c @@ -939,6 +939,14 @@ static void ieee802_11_rx_bss_trans_mgmt_req(struct wpa_supplicant *wpa_s, } wnm_set_scan_freqs(wpa_s); + if (wpa_s->wnm_num_neighbor_report == 1) { + os_memcpy(wpa_s->next_scan_bssid, + wpa_s->wnm_neighbor_report_elements[0].bssid, + ETH_ALEN); + wpa_printf(MSG_DEBUG, + "WNM: Scan only for a specific BSSID since there is only a single candidate " + MACSTR, MAC2STR(wpa_s->next_scan_bssid)); + } wpa_supplicant_req_scan(wpa_s, 0, 0); } else if (reply) { enum bss_trans_mgmt_status_code status; diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h index 3b7a6994..852f7a6d 100644 --- a/wpa_supplicant/wpa_supplicant_i.h +++ b/wpa_supplicant/wpa_supplicant_i.h @@ -622,6 +622,7 @@ struct wpa_supplicant { #define MAX_SCAN_ID 16 int scan_id[MAX_SCAN_ID]; unsigned int scan_id_count; + u8 next_scan_bssid[ETH_ALEN]; struct wpa_ssid_value *ssids_from_scan_req; unsigned int num_ssids_from_scan_req; |