Fix enabling of networks while another network is being used

Enable a network block, even if there is a current configuration, if it
was disabled.

Signed-off-by: Kel Modderman <kel@otaku42.de>
This commit is contained in:
Kel Modderman 2010-05-02 11:08:03 +03:00 committed by Jouni Malinen
parent 1bc774a12a
commit adc8d4a791

View file

@ -1392,13 +1392,15 @@ void wpa_supplicant_enable_network(struct wpa_supplicant *wpa_s,
}
if (wpa_s->reassociate)
wpa_supplicant_req_scan(wpa_s, 0, 0);
} else if (wpa_s->current_ssid == NULL && ssid->disabled) {
/*
* Try to reassociate since there is no current configuration
* and a new network was made available.
*/
wpa_s->reassociate = 1;
wpa_supplicant_req_scan(wpa_s, 0, 0);
} else if (ssid->disabled) {
if (wpa_s->current_ssid == NULL) {
/*
* Try to reassociate since there is no current
* configuration and a new network was made available.
*/
wpa_s->reassociate = 1;
wpa_supplicant_req_scan(wpa_s, 0, 0);
}
was_disabled = ssid->disabled;