TDLS: Declare tdls_testing as extern in a header file

[mech_eap.git] / wpa_supplicant / bgscan_learn.c

diff --git a/wpa_supplicant/bgscan_learn.c b/wpa_supplicant/bgscan_learn.c
index 92ec55c..a320cc4 100644 (file)
--- a/wpa_supplicant/bgscan_learn.c
+++ b/wpa_supplicant/bgscan_learn.c
@@ -34,7 +34,7 @@ struct bgscan_learn_data {
        int signal_threshold;
        int short_interval; /* use if signal < threshold */
        int long_interval; /* use if signal > threshold */
-       struct os_time last_bgscan;
+       struct os_reltime last_bgscan;
        char *fname;
        struct dl_list bss;
        int *supp_freqs;
@@ -240,17 +240,14 @@ static int * bgscan_learn_get_probe_freq(struct bgscan_learn_data *data,
        if (data->supp_freqs == NULL)
                return freqs;
 
-       idx = data->probe_idx + 1;
-       while (idx != data->probe_idx) {
-               if (data->supp_freqs[idx] == 0) {
-                       if (data->probe_idx == 0)
-                               break;
-                       idx = 0;
-               }
+       idx = data->probe_idx;
+       do {
                if (!in_array(freqs, data->supp_freqs[idx])) {
                        wpa_printf(MSG_DEBUG, "bgscan learn: Probe new freq "
                                   "%u", data->supp_freqs[idx]);
-                       data->probe_idx = idx;
+                       data->probe_idx = idx + 1;
+                       if (data->supp_freqs[data->probe_idx] == 0)
+                               data->probe_idx = 0;
                        n = os_realloc_array(freqs, count + 2, sizeof(int));
                        if (n == NULL)
                                return freqs;
@@ -262,7 +259,9 @@ static int * bgscan_learn_get_probe_freq(struct bgscan_learn_data *data,
                }
 
                idx++;
-       }
+               if (data->supp_freqs[idx] == 0)
+                       idx = 0;
+       } while (idx != data->probe_idx);
 
        return freqs;
 }
@@ -295,7 +294,7 @@ static void bgscan_learn_timeout(void *eloop_ctx, void *timeout_ctx)
                        int ret;
                        ret = os_snprintf(pos, msg + sizeof(msg) - pos, " %d",
                                          freqs[i]);
-                       if (ret < 0 || ret >= msg + sizeof(msg) - pos)
+                       if (os_snprintf_error(msg + sizeof(msg) - pos, ret))
                                break;
                        pos += ret;
                }
@@ -311,7 +310,7 @@ static void bgscan_learn_timeout(void *eloop_ctx, void *timeout_ctx)
                eloop_register_timeout(data->scan_interval, 0,
                                       bgscan_learn_timeout, data, NULL);
        } else
-               os_get_time(&data->last_bgscan);
+               os_get_reltime(&data->last_bgscan);
        os_free(freqs);
 }
 
@@ -422,6 +421,14 @@ static void * bgscan_learn_init(struct wpa_supplicant *wpa_s,
 
        data->supp_freqs = bgscan_learn_get_supp_freqs(wpa_s);
        data->scan_interval = data->short_interval;
+       if (data->signal_threshold) {
+               /* Poll for signal info to set initial scan interval */
+               struct wpa_signal_info siginfo;
+               if (wpa_drv_signal_poll(wpa_s, &siginfo) == 0 &&
+                   siginfo.current_signal >= data->signal_threshold)
+                       data->scan_interval = data->long_interval;
+       }
+
        eloop_register_timeout(data->scan_interval, 0, bgscan_learn_timeout,
                               data, NULL);
 
@@ -431,7 +438,7 @@ static void * bgscan_learn_init(struct wpa_supplicant *wpa_s,
         * us skip an immediate new scan in cases where the current signal
         * level is below the bgscan threshold.
         */
-       os_get_time(&data->last_bgscan);
+       os_get_reltime(&data->last_bgscan);
 
        return data;
 }
@@ -558,7 +565,7 @@ static void bgscan_learn_notify_signal_change(void *priv, int above,
 {
        struct bgscan_learn_data *data = priv;
        int scan = 0;
-       struct os_time now;
+       struct os_reltime now;
 
        if (data->short_interval == data->long_interval ||
            data->signal_threshold == 0)
@@ -572,7 +579,7 @@ static void bgscan_learn_notify_signal_change(void *priv, int above,
                wpa_printf(MSG_DEBUG, "bgscan learn: Start using short bgscan "
                           "interval");
                data->scan_interval = data->short_interval;
-               os_get_time(&now);
+               os_get_reltime(&now);
                if (now.sec > data->last_bgscan.sec + 1)
                        scan = 1;
        } else if (data->scan_interval == data->short_interval && above) {
@@ -587,7 +594,7 @@ static void bgscan_learn_notify_signal_change(void *priv, int above,
                 * Signal dropped further 4 dB. Request a new scan if we have
                 * not yet scanned in a while.
                 */
-               os_get_time(&now);
+               os_get_reltime(&now);
                if (now.sec > data->last_bgscan.sec + 10)
                        scan = 1;
        }