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/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index d5e5000..81d00f3 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -1420,6 +1420,7 @@
 			wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_FREQ_CONFLICT
 				" id=%d", ssid->id);
 			os_memset(wpa_s->pending_bssid, 0, ETH_ALEN);
+			return;
 		}
 	}
 #endif
@@ -3123,15 +3124,14 @@
 }
 
 #ifdef ANDROID_P2P
-int wpas_is_interface_prioritized(struct wpa_supplicant *wpa_s)
+int wpas_is_p2p_prioritized(struct wpa_supplicant *wpa_s)
 {
-	if(wpa_s->conf->prioritize &&
-		!os_strncmp(wpa_s->conf->prioritize, wpa_s->ifname, sizeof(wpa_s->ifname))) {
-		/* The given interface is prioritized */
-		wpa_printf(MSG_DEBUG, "Given interface (%s) is prioritized" , wpa_s->ifname);
+	if(os_strncmp(wpa_s->global->conc_priority, "p2p", 3) == 0)
 		return 1;
-	}
-	wpa_printf(MSG_DEBUG, "Given interface (%s) is not prioritized" , wpa_s->ifname);
-	return 0;
+	else if(os_strncmp(wpa_s->global->conc_priority, "sta", 3) == 0)
+		return 0;
+
+	/* IF conc_priority is not set, return -1 */
+	return -1;
 }
 #endif