commit cb201af5418543bb515be3e04f945d75cf721282
author Dmitry Shmidt <dimitrysh@google.com> Thu Feb 14 16:44:44 2013 -0800
committer Jouni Malinen <j@w1.fi> Sat Apr 02 17:52:32 2016 +0300
tree 16db1da19196af7f7a427033973d8684d73ac30a
parent bb8866d8f54a054c2fe08c4c8462af94fd55bf82

Update AP IE regardless WPA_DRIVER_FLAGS_BSS_SELECTION flag

Change-Id: Ia2b0aea81e250cfd989861ed37551ca8c41f7a66
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
(cherry picked from commit 18306c6ac9281cca7d986a0d780047df0f32675f)

Conflicts:
	wpa_supplicant/events.c

wpa_supplicant/events.c

diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index e7ff150..436ea32 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -2259,8 +2259,12 @@
 		}
 	}
 
+#ifdef ANDROID
+	if (wpa_s->conf->ap_scan == 1) {
+#else /* ANDROID */
 	if (wpa_s->conf->ap_scan == 1 &&
 	    wpa_s->drv_flags & WPA_DRIVER_FLAGS_BSS_SELECTION) {
+#endif /* ANDROID */
 		if (wpa_supplicant_assoc_update_ie(wpa_s) < 0 && new_bss)
 			wpa_msg(wpa_s, MSG_WARNING,
 				"WPA/RSN IEs not updated");