aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2013-02-15 00:44:44 (GMT)
committerJouni Malinen <j@w1.fi>2016-04-02 14:52:32 (GMT)
commitcb201af5418543bb515be3e04f945d75cf721282 (patch)
tree16db1da19196af7f7a427033973d8684d73ac30a
parentbb8866d8f54a054c2fe08c4c8462af94fd55bf82 (diff)
downloadhostap-android-m.zip
hostap-android-m.tar.gz
hostap-android-m.tar.bz2
Update AP IE regardless WPA_DRIVER_FLAGS_BSS_SELECTION flagandroid-m
Change-Id: Ia2b0aea81e250cfd989861ed37551ca8c41f7a66 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> (cherry picked from commit 18306c6ac9281cca7d986a0d780047df0f32675f) Conflicts: wpa_supplicant/events.c
-rw-r--r--wpa_supplicant/events.c4
1 files changed, 4 insertions, 0 deletions
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 @@ 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");