diff options
| -rw-r--r-- | src/drivers/driver.h | 6 | ||||
| -rw-r--r-- | src/drivers/driver_wext.c | 4 | ||||
| -rw-r--r-- | wpa_supplicant/scan.c | 18 | ||||
| -rw-r--r-- | wpa_supplicant/wpa_supplicant.c | 2 | ||||
| -rw-r--r-- | wpa_supplicant/wpa_supplicant_i.h | 6 |
5 files changed, 18 insertions, 18 deletions
diff --git a/src/drivers/driver.h b/src/drivers/driver.h index 25a0d90..c5f2106 100644 --- a/src/drivers/driver.h +++ b/src/drivers/driver.h @@ -156,7 +156,7 @@ struct wpa_driver_scan_params { /** * ssid - specific SSID to scan for (ProbeReq) * %NULL or zero-length SSID is used to indicate active scan - * with broadcast SSID. + * with wildcard SSID. */ const u8 *ssid; /** @@ -601,8 +601,8 @@ struct wpa_driver_ops { * scan - Request the driver to initiate scan (old version) * @priv: private driver interface data * @ssid: specific SSID to scan for (ProbeReq) or %NULL to scan for - * all SSIDs (either active scan with broadcast SSID or passive - * scan + * all SSIDs (either active scan with wildcard SSID or passive + * scan) * @ssid_len: length of the SSID * * Returns: 0 on success, -1 on failure diff --git a/src/drivers/driver_wext.c b/src/drivers/driver_wext.c index f21c379..1c9105b 100644 --- a/src/drivers/driver_wext.c +++ b/src/drivers/driver_wext.c @@ -1076,8 +1076,8 @@ void wpa_driver_wext_scan_timeout(void *eloop_ctx, void *timeout_ctx) * wpa_driver_wext_scan - Request the driver to initiate scan * @priv: Pointer to private wext data from wpa_driver_wext_init() * @ssid: Specific SSID to scan for (ProbeReq) or %NULL to scan for - * all SSIDs (either active scan with broadcast SSID or passive - * scan + * all SSIDs (either active scan with wildcard SSID or passive + * scan) * @ssid_len: Length of the SSID * Returns: 0 on success, -1 on failure */ diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c index a722572..bac37e6 100644 --- a/wpa_supplicant/scan.c +++ b/wpa_supplicant/scan.c @@ -91,7 +91,7 @@ static void wpa_supplicant_assoc_try(struct wpa_supplicant *wpa_s, if (ssid == NULL) { wpa_printf(MSG_DEBUG, "wpa_supplicant_scan: Reached " "end of scan list - go back to beginning"); - wpa_s->prev_scan_ssid = BROADCAST_SSID_SCAN; + wpa_s->prev_scan_ssid = WILDCARD_SSID_SCAN; wpa_supplicant_req_scan(wpa_s, 0, 0); return; } @@ -100,7 +100,7 @@ static void wpa_supplicant_assoc_try(struct wpa_supplicant *wpa_s, wpa_s->prev_scan_ssid = ssid; } else { /* Start from the beginning of the SSID list. */ - wpa_s->prev_scan_ssid = BROADCAST_SSID_SCAN; + wpa_s->prev_scan_ssid = WILDCARD_SSID_SCAN; } wpa_supplicant_associate(wpa_s, NULL, ssid); } @@ -174,7 +174,7 @@ static void wpa_supplicant_scan(void *eloop_ctx, void *timeout_ctx) /* Find the starting point from which to continue scanning */ ssid = wpa_s->conf->ssid; - if (wpa_s->prev_scan_ssid != BROADCAST_SSID_SCAN) { + if (wpa_s->prev_scan_ssid != WILDCARD_SSID_SCAN) { while (ssid) { if (ssid == wpa_s->prev_scan_ssid) { ssid = ssid->next; @@ -189,8 +189,8 @@ static void wpa_supplicant_scan(void *eloop_ctx, void *timeout_ctx) return; } else if (wpa_s->conf->ap_scan == 2) { /* - * User-initiated scan request in ap_scan == 2; use broadcast - * scan. + * User-initiated scan request in ap_scan == 2; scan with + * wildcard SSID. */ ssid = NULL; } else { @@ -221,15 +221,15 @@ static void wpa_supplicant_scan(void *eloop_ctx, void *timeout_ctx) if (ssid) { wpa_s->prev_scan_ssid = ssid; if (max_ssids > 1) { - wpa_printf(MSG_DEBUG, "Include broadcast SSID in the " + wpa_printf(MSG_DEBUG, "Include wildcard SSID in the " "scan request"); - params.num_ssids++; /* Broadcast scan */ + params.num_ssids++; } wpa_printf(MSG_DEBUG, "Starting AP scan for specific SSID(s)"); } else { - wpa_s->prev_scan_ssid = BROADCAST_SSID_SCAN; + wpa_s->prev_scan_ssid = WILDCARD_SSID_SCAN; params.num_ssids++; - wpa_printf(MSG_DEBUG, "Starting AP scan for broadcast SSID"); + wpa_printf(MSG_DEBUG, "Starting AP scan for wildcard SSID"); } #ifdef CONFIG_WPS diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index 9b6f088..b7fd57c 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -1688,7 +1688,7 @@ int wpa_supplicant_driver_init(struct wpa_supplicant *wpa_s) wpa_printf(MSG_DEBUG, "RSN: flushing PMKID list in the driver"); wpa_drv_flush_pmkid(wpa_s); - wpa_s->prev_scan_ssid = BROADCAST_SSID_SCAN; + wpa_s->prev_scan_ssid = WILDCARD_SSID_SCAN; wpa_supplicant_req_scan(wpa_s, interface_count, 100000); interface_count++; diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h index 92ba22f..d8e7fb2 100644 --- a/wpa_supplicant/wpa_supplicant_i.h +++ b/wpa_supplicant/wpa_supplicant_i.h @@ -309,11 +309,11 @@ struct wpa_supplicant { struct wpa_ssid *prev_scan_ssid; /* previously scanned SSID; * NULL = not yet initialized (start - * with broadcast SSID) - * BROADCAST_SSID_SCAN = broadcast + * with wildcard SSID) + * WILDCARD_SSID_SCAN = wildcard * SSID was used in the previous scan */ -#define BROADCAST_SSID_SCAN ((struct wpa_ssid *) 1) +#define WILDCARD_SSID_SCAN ((struct wpa_ssid *) 1) struct wpa_scan_results *scan_res; |