From: Dmitry Shmidt <dimitrysh@google.com>
Date: Fri, 15 Feb 2013 00:44:44 +0000 (-0800)
Subject: Update AP IE regardless WPA_DRIVER_FLAGS_BSS_SELECTION flag
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb201af5418543bb515be3e04f945d75cf721282;p=thirdparty%2Fhostap.git

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
---

diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index e7ff15050..436ea3261 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -2259,8 +2259,12 @@ static void wpa_supplicant_event_assoc(struct wpa_supplicant *wpa_s,
 		}
 	}
 
+#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");