aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2013-09-19 02:20:36 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2013-09-19 02:20:36 -0700
commitbc0a8cab332310f20107556f3ede419fe0126660 (patch)
tree8aaeaee276c2d5d56766e40bd3d1fa3d0d45d86f
parenta1e09444bae969876bb7b3eedb392dc8860ac602 (diff)
parent257a25c8804fe1972138dcc4c764569f8238e5ff (diff)
downloadandroid_external_wpa_supplicant_8-bc0a8cab332310f20107556f3ede419fe0126660.tar.gz
android_external_wpa_supplicant_8-bc0a8cab332310f20107556f3ede419fe0126660.tar.bz2
android_external_wpa_supplicant_8-bc0a8cab332310f20107556f3ede419fe0126660.zip
Merge "Use configured sched_scan interval for the PNO scan"
-rw-r--r--wpa_supplicant/ctrl_iface.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
index 192b2324..5e5391f2 100644
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -50,7 +50,7 @@ static int wpa_supplicant_global_iface_interfaces(struct wpa_global *global,
static int pno_start(struct wpa_supplicant *wpa_s)
{
- int ret;
+ int ret, interval;
size_t i, num_ssid;
struct wpa_ssid *ssid;
struct wpa_driver_scan_params params;
@@ -108,7 +108,10 @@ static int pno_start(struct wpa_supplicant *wpa_s)
if (wpa_s->conf->filter_rssi)
params.filter_rssi = wpa_s->conf->filter_rssi;
- ret = wpa_drv_sched_scan(wpa_s, &params, 10 * 1000);
+ interval = wpa_s->conf->sched_scan_interval ?
+ wpa_s->conf->sched_scan_interval : 10;
+
+ ret = wpa_drv_sched_scan(wpa_s, &params, interval * 1000);
os_free(params.filter_ssids);
if (ret == 0)
wpa_s->pno = 1;