aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2011-05-24 15:40:26 -0700
committerDmitry Shmidt <dimitrysh@google.com>2011-05-24 15:40:26 -0700
commit29991f40caccd6c45cd7c56ca597f370a4f2b9eb (patch)
tree79ba5a5cb57ef6f2bd8dd33b63479eaedce1f843 /src
parent886c3ff164ee2c0e281f4b1f31ce2b00f045f9de (diff)
downloadandroid_external_wpa_supplicant_8-29991f40caccd6c45cd7c56ca597f370a4f2b9eb.tar.gz
android_external_wpa_supplicant_8-29991f40caccd6c45cd7c56ca597f370a4f2b9eb.tar.bz2
android_external_wpa_supplicant_8-29991f40caccd6c45cd7c56ca597f370a4f2b9eb.zip
WEXT: Suppress additional DISASSOCIATE events
Change-Id: Id65428908bca59e71a3ab479b63d992eff96e433 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'src')
-rw-r--r--src/drivers/driver_wext.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/src/drivers/driver_wext.c b/src/drivers/driver_wext.c
index 01394783..f7df7cba 100644
--- a/src/drivers/driver_wext.c
+++ b/src/drivers/driver_wext.c
@@ -486,10 +486,19 @@ static void wpa_driver_wext_event_wireless(struct wpa_driver_wext_data *drv,
drv->assoc_req_ies = NULL;
os_free(drv->assoc_resp_ies);
drv->assoc_resp_ies = NULL;
+#ifdef ANDROID
+ if (!drv->skip_disconnect) {
+ drv->skip_disconnect = 1;
+#endif
wpa_supplicant_event(drv->ctx, EVENT_DISASSOC,
NULL);
-
+#ifdef ANDROID
+ }
+#endif
} else {
+#ifdef ANDROID
+ drv->skip_disconnect = 0;
+#endif
wpa_driver_wext_event_assoc_ies(drv);
wpa_supplicant_event(drv->ctx, EVENT_ASSOC,
NULL);
@@ -2043,7 +2052,9 @@ int wpa_driver_wext_associate(void *priv,
int value;
wpa_printf(MSG_DEBUG, "%s", __FUNCTION__);
-
+#ifdef ANDROID
+ drv->skip_disconnect = 0;
+#endif
if (drv->cfg80211) {
/*
* Stop cfg80211 from trying to associate before we are done