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/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
index ff3486e..d75b8fb 100644
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -3169,7 +3169,21 @@
 		}
 		return 0;
 	}
-
+#ifdef ANDROID_P2P
+	if (os_strcmp(cmd, "conc_priority") == 0) {
+		if(os_strncmp(cmd+strlen("conc_priority")+1, "sta", 3) == 0)
+			os_strncpy(wpa_s->global->conc_priority, "sta", 3);
+		else if(os_strncmp(cmd+strlen("conc_priority")+1, "p2p", 3) == 0)
+			os_strncpy(wpa_s->global->conc_priority, "p2p", 3);
+		else {
+			wpa_printf(MSG_ERROR, " conc_priority arg should be either sta or p2p");
+			return -1;
+		}
+		wpa_printf(MSG_DEBUG, "Single Channel Concurrency: Prioritize %s",
+			   wpa_s->global->conc_priority);
+		return 0;
+	}
+#endif
 	if (os_strcmp(cmd, "force_long_sd") == 0) {
 		wpa_s->force_long_sd = atoi(param);
 		return 0;