bgscan_learn: Scan all channels in certain scenarios

[build-utilities/hostap.git] / wpa_supplicant / bgscan_learn.c

diff --git a/wpa_supplicant/bgscan_learn.c b/wpa_supplicant/bgscan_learn.c
index b887d153670113092d6d502a0a0d4bb200ef931e..b0368f94d09f57fb77cb49bb889f6538f705abc6 100644 (file)
--- a/wpa_supplicant/bgscan_learn.c
+++ b/wpa_supplicant/bgscan_learn.c
@@ -284,21 +284,33 @@ static void bgscan_learn_timeout(void *eloop_ctx, void *timeout_ctx)
                freqs = bgscan_learn_get_freqs(data, &count);
                wpa_printf(MSG_DEBUG, "bgscan learn: BSSes in this ESS have "
                           "been seen on %u channels", (unsigned int) count);
-               freqs = bgscan_learn_get_probe_freq(data, freqs, count);
-
-               msg[0] = '\0';
-               pos = msg;
-               for (i = 0; freqs && freqs[i]; i++) {
-                       int ret;
-                       ret = os_snprintf(pos, msg + sizeof(msg) - pos, " %d",
-                                         freqs[i]);
-                       if (ret < 0 || ret >= msg + sizeof(msg) - pos)
-                               break;
-                       pos += ret;
+
+               if (data->scan_interval == data->short_interval && count < 2) {
+                       os_free(freqs);
+                       freqs = NULL;
+                       wpa_printf(MSG_DEBUG,
+                                  "bgscan_learn: Scanning all frequencies");
+               } else {
+                       freqs = bgscan_learn_get_probe_freq(data, freqs, count);
+
+                       msg[0] = '\0';
+                       pos = msg;
+                       for (i = 0; freqs && freqs[i]; i++) {
+                               int ret;
+                               ret = os_snprintf(pos, msg + sizeof(msg) - pos,
+                                                 " %d", freqs[i]);
+                               if (ret < 0 ||
+                                   ret >= msg + sizeof(msg) - pos)
+                                       break;
+                               pos += ret;
+                       }
+                       pos[0] = '\0';
+
+                       wpa_printf(MSG_DEBUG, "bgscan learn: "
+                                  "Scanning frequencies:%s",
+                                  msg);
                }
-               pos[0] = '\0';
-               wpa_printf(MSG_DEBUG, "bgscan learn: Scanning frequencies:%s",
-                          msg);
+
                params.freqs = freqs;
        }