Update to Version 0.8.24 from BRCM
- Add 'conc_priority' command
- Fix handling a single channel concurrency case: If conc_priority
is not set, advertise the frequency conflict to the framework and
disable the new connection attempted
- When P2P Interface gets removed due to single channel frequency
conflict, show GROUP_REMOVE reason=FREQ_CONFLICT
- Fix sched scan processing
Change-Id: Ie6fe105cebd379a0a9c49ace62d2e48e71571107
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c
index 21cde92..5aee7ff 100644
--- a/wpa_supplicant/scan.c
+++ b/wpa_supplicant/scan.c
@@ -238,13 +238,18 @@
int interval)
{
int ret;
-
+#ifndef ANDROID_P2P
wpa_supplicant_notify_scanning(wpa_s, 1);
+#endif
ret = wpa_drv_sched_scan(wpa_s, params, interval * 1000);
if (ret)
wpa_supplicant_notify_scanning(wpa_s, 0);
- else
+ else {
wpa_s->sched_scanning = 1;
+#ifdef ANDROID_P2P
+ wpa_supplicant_notify_scanning(wpa_s, 1);
+#endif
+ }
return ret;
}
@@ -782,9 +787,11 @@
sizeof(struct wpa_driver_scan_filter));
prev_state = wpa_s->wpa_state;
+#ifndef ANDROID_P2P
if (wpa_s->wpa_state == WPA_DISCONNECTED ||
wpa_s->wpa_state == WPA_INACTIVE)
wpa_supplicant_set_state(wpa_s, WPA_SCANNING);
+#endif
/* Find the starting point from which to continue scanning */
ssid = wpa_s->conf->ssid;
@@ -939,7 +946,12 @@
int scanning)
{
if (wpa_s->scanning != scanning) {
+#ifdef ANDROID_P2P
+ if(!wpa_s->sched_scanning)
+ wpa_s->scanning = scanning;
+#else
wpa_s->scanning = scanning;
+#endif
wpas_notify_scanning(wpa_s);
}
}