summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2010-03-10 16:21:57 -0800
committerDmitry Shmidt <dimitrysh@google.com>2010-03-10 16:21:57 -0800
commit79e900421c74530eaf337d72d3b3f7fce7725617 (patch)
treeb988753c22c07f710942f7109c61b355be9683c4
parenta10044f899f2a7910a88c924af231197b9503089 (diff)
downloadwlan-79e900421c74530eaf337d72d3b3f7fce7725617.tar.gz
wl1271: Fix Association order and clean scan cache after "driver stop"
Change-Id: I204c53712a2aeccfb67f2187f6d5b80d3d481fb8 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
-rw-r--r--wl1271/wpa_supplicant_lib/driver_ti.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/wl1271/wpa_supplicant_lib/driver_ti.c b/wl1271/wpa_supplicant_lib/driver_ti.c
index a761716..d5afff7 100644
--- a/wl1271/wpa_supplicant_lib/driver_ti.c
+++ b/wl1271/wpa_supplicant_lib/driver_ti.c
@@ -615,6 +615,7 @@ static int wpa_driver_tista_driver_cmd( void *priv, char *cmd, char *buf, size_t
}
ret = wpa_driver_tista_driver_stop(priv);
if( ret == 0 ) {
+ scan_exit(drv); /* Clear scan cache */
drv->driver_is_loaded = FALSE;
wpa_msg(drv->ctx, MSG_INFO, WPA_EVENT_DRIVER_STATE "STOPPED");
}
@@ -1307,8 +1308,10 @@ static int wpa_driver_tista_associate(void *priv,
}
}
+#if 0
if (!params->bssid)
wpa_driver_wext_set_bssid(drv->wext, NULL);
+#endif
#ifdef WPA_SUPPLICANT_VER_0_5_X
/* Set driver network mode (Adhoc/Infrastructure) according to supplied parameters */
@@ -1363,7 +1366,6 @@ static int wpa_driver_tista_associate(void *priv,
if (params->freq)
wpa_driver_wext_set_freq(drv->wext, params->freq);
- ret = wpa_driver_wext_set_ssid(drv->wext, params->ssid, params->ssid_len);
if (params->bssid) {
wpa_printf(MSG_DEBUG, "wpa_driver_tista_associate: BSSID=" MACSTR,
MAC2STR(params->bssid));
@@ -1372,7 +1374,7 @@ static int wpa_driver_tista_associate(void *priv,
wpa_driver_wext_set_bssid(drv->wext, params->bssid);
}
}
-
+ ret = wpa_driver_wext_set_ssid(drv->wext, params->ssid, params->ssid_len);
return ret;
}