aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/interworking.c
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2012-08-19 09:26:21 (GMT)
committerJouni Malinen <j@w1.fi>2012-08-19 09:26:21 (GMT)
commit2b95f57ba5d374baff72d111fcec8ba5a86e7fa8 (patch)
tree2c49b2f2b9ce8ec6a3c3a638407010fbea385dad /wpa_supplicant/interworking.c
parent7f996409e7e5aa0bb066257906e87ab3294d4fd0 (diff)
downloadhostap-2b95f57ba5d374baff72d111fcec8ba5a86e7fa8.zip
hostap-2b95f57ba5d374baff72d111fcec8ba5a86e7fa8.tar.gz
hostap-2b95f57ba5d374baff72d111fcec8ba5a86e7fa8.tar.bz2
Interworking: Do not reconnect without "auto" parameter
When there was no credential match, but an enabled network block matched with a scan result, wpa_supplicant reconnected at the end of interworking_select command even if "auto" parameter was not used. Fix this by running the reconnect only if requested to automatically select a network. Signed-hostap: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'wpa_supplicant/interworking.c')
-rw-r--r--wpa_supplicant/interworking.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/wpa_supplicant/interworking.c b/wpa_supplicant/interworking.c
index ea720d2..cdb7fbc 100644
--- a/wpa_supplicant/interworking.c
+++ b/wpa_supplicant/interworking.c
@@ -1395,7 +1395,8 @@ static void interworking_select_network(struct wpa_supplicant *wpa_s)
if (interworking_find_network_match(wpa_s)) {
wpa_printf(MSG_DEBUG, "Interworking: Possible BSS "
"match for enabled network configurations");
- interworking_reconnect(wpa_s);
+ if (wpa_s->auto_select)
+ interworking_reconnect(wpa_s);
return;
}