CHROMIUMOS: wpa_supplicant: Honor initial bgscan timer

wpa_supplicant/bgscan_simple.c

 /*
  * WPA Supplicant - background scan and roaming module: simple
  * Copyright (c) 2009-2010, Jouni Malinen <j@w1.fi>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  *
  * Alternatively, this software may be distributed under the terms of BSD
  * license.
@@ skipping 13 matching lines @@
 #include "bgscan.h"
 
 struct bgscan_simple_data {
         struct wpa_supplicant *wpa_s;
         const struct wpa_ssid *ssid;
         int scan_interval;
         int signal_threshold;
         int short_interval; /* use if signal < threshold */
         int long_interval; /* use if signal > threshold */
         struct os_time last_bgscan;
+        int init_scan;
 };
 
 
 static void bgscan_simple_timeout(void *eloop_ctx, void *timeout_ctx)
 {
         struct bgscan_simple_data *data = eloop_ctx;
         struct wpa_supplicant *wpa_s = data->wpa_s;
         struct wpa_driver_scan_params params;
 
         os_memset(&params, 0, sizeof(params));
         params.num_ssids = 1;
         params.ssids[0].ssid = data->ssid->ssid;
         params.ssids[0].ssid_len = data->ssid->ssid_len;
         params.freqs = data->ssid->scan_freq;
 
         /*
          * A more advanced bgscan module would learn about most like channels
          * over time and request scans only for some channels (probing others
          * every now and then) to reduce effect on the data connection.
          */
 
         wpa_printf(MSG_DEBUG, "bgscan simple: Request a background scan");
         if (wpa_supplicant_trigger_scan(wpa_s, &params)) {
                 wpa_printf(MSG_DEBUG, "bgscan simple: Failed to trigger scan");
                 eloop_register_timeout(data->scan_interval, 0,
                                        bgscan_simple_timeout, data, NULL);
-        } else
+        } else {
                 os_get_time(&data->last_bgscan);
+                data->init_scan = 0;
+        }
 }
 
 
 static int bgscan_simple_get_params(struct bgscan_simple_data *data,
                                     const char *params)
 {
         const char *pos;
 
         if (params == NULL)
                 return 0;
@@ skipping 43 matching lines @@
                    data->signal_threshold, data->short_interval,
                    data->long_interval);
 
         if (data->signal_threshold &&
             wpa_drv_signal_monitor(wpa_s, data->signal_threshold, 4) < 0) {
                 wpa_printf(MSG_ERROR, "bgscan simple: Failed to enable "
                            "signal strength monitoring");
         }
 
         data->scan_interval = data->short_interval;
+        data->init_scan = 1;
         eloop_register_timeout(data->scan_interval, 0, bgscan_simple_timeout,
                                data, NULL);
         return data;
 }
 
 
 static void bgscan_simple_deinit(void *priv)
 {
         struct bgscan_simple_data *data = priv;
         eloop_cancel_timeout(bgscan_simple_timeout, data, NULL);
@@ skipping 29 matching lines @@
         wpa_printf(MSG_DEBUG, "bgscan simple: beacon loss");
         /* TODO: speed up background scanning */
 }
 
 
 static void bgscan_simple_notify_signal_change(void *priv, int above)
 {
         struct bgscan_simple_data *data = priv;
 
         if (data->short_interval == data->long_interval ||
-            data->signal_threshold == 0)
+            data->signal_threshold == 0 ||
+            data->init_scan != 0)
                 return;
 
         wpa_printf(MSG_DEBUG, "bgscan simple: signal level changed "
                    "(above=%d)", above);
         if (data->scan_interval == data->long_interval && !above) {
                 wpa_printf(MSG_DEBUG, "bgscan simple: Trigger immediate scan "
                            "and start using short bgscan interval");
                 data->scan_interval = data->short_interval;
                 eloop_cancel_timeout(bgscan_simple_timeout, data, NULL);
                 eloop_register_timeout(0, 0, bgscan_simple_timeout, data,
@@ skipping 25 matching lines @@
 
 
 const struct bgscan_ops bgscan_simple_ops = {
         .name = "simple",
         .init = bgscan_simple_init,
         .deinit = bgscan_simple_deinit,
         .notify_scan = bgscan_simple_notify_scan,
         .notify_beacon_loss = bgscan_simple_notify_beacon_loss,
         .notify_signal_change = bgscan_simple_notify_signal_change,
 };