diff options
author | Felix Fietkau <nbd@openwrt.org> | 2010-11-09 01:36:36 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2010-11-09 01:36:36 +0000 |
commit | be617d74f89ea6df86914da9ac3fdf0fe61f5a15 (patch) | |
tree | 4eef31c26fcc6e6f251cb7bc2b3da3cd20927dd6 /package/hostapd/patches/310-scan_ssid.patch | |
parent | 7968d51bdc39efb4efac237a90375256c50aee3e (diff) | |
download | upstream-be617d74f89ea6df86914da9ac3fdf0fe61f5a15.tar.gz upstream-be617d74f89ea6df86914da9ac3fdf0fe61f5a15.tar.bz2 upstream-be617d74f89ea6df86914da9ac3fdf0fe61f5a15.zip |
hostapd: update to 20101109, reorganize patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23932 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/hostapd/patches/310-scan_ssid.patch')
-rw-r--r-- | package/hostapd/patches/310-scan_ssid.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/package/hostapd/patches/310-scan_ssid.patch b/package/hostapd/patches/310-scan_ssid.patch deleted file mode 100644 index 884459ce66..0000000000 --- a/package/hostapd/patches/310-scan_ssid.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/wpa_supplicant/scan.c -+++ b/wpa_supplicant/scan.c -@@ -248,6 +248,7 @@ static void wpa_supplicant_scan(void *el - enum wps_request_type req_type = WPS_REQ_ENROLLEE_INFO; - #endif /* CONFIG_WPS */ - struct wpa_driver_scan_params params; -+ int scan_ssid_all = 1; - size_t max_ssids; - enum wpa_states prev_state; - -@@ -316,6 +317,16 @@ static void wpa_supplicant_scan(void *el - wpa_s->wpa_state == WPA_INACTIVE) - wpa_supplicant_set_state(wpa_s, WPA_SCANNING); - -+ /* check if all configured ssids should be scanned directly */ -+ ssid = wpa_s->conf->ssid; -+ while (ssid) { -+ if (!ssid->scan_ssid) { -+ scan_ssid_all = 0; -+ break; -+ } -+ ssid = ssid->next; -+ } -+ - /* Find the starting point from which to continue scanning */ - ssid = wpa_s->conf->ssid; - if (wpa_s->prev_scan_ssid != WILDCARD_SSID_SCAN) { -@@ -379,6 +390,9 @@ static void wpa_supplicant_scan(void *el - int_array_sort_unique(params.freqs); - } - -+ if (scan_ssid_all && !ssid) -+ ssid = wpa_s->conf->ssid; -+ - if (ssid) { - wpa_s->prev_scan_ssid = ssid; - if (max_ssids > 1) { |