jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

hostapd: Don't get stuck after failed ACS

Browse source 
If ACS fails we still need to call hostapd_setup_interface_complete.
Otherwise hostapd will just hang doing nothing anymore. However, pass
an error to hostapd_setup_interface_complete to allow a graceful fail.

Signed-hostap: Helmut Schaa <helmut.schaa@googlemail.com>
This commit is contained in:
Helmut Schaa 2013-10-23 00:15:57 +03:00 committed by Jouni Malinen
parent c23eea8867
commit 0e1d0b370f
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/ap/hw_features.c
View file

@ -760,7 +760,7 @@ static void hostapd_notify_bad_chans(struct hostapd_iface *iface)
int hostapd_acs_completed(struct hostapd_iface *iface)
{
int ret;
int ret = -1;
switch (hostapd_check_chans(iface)) {
case HOSTAPD_CHAN_VALID:
@ -768,23 +768,25 @@ int hostapd_acs_completed(struct hostapd_iface *iface)
case HOSTAPD_CHAN_ACS:
wpa_printf(MSG_ERROR, "ACS error - reported complete, but no result available");
hostapd_notify_bad_chans(iface);
return -1;
goto out;
case HOSTAPD_CHAN_INVALID:
default:
wpa_printf(MSG_ERROR, "ACS picked unusable channels");
hostapd_notify_bad_chans(iface);
return -1;
goto out;
}
ret = hostapd_check_ht_capab(iface);
if (ret < 0)
return -1;
goto out;
if (ret == 1) {
wpa_printf(MSG_DEBUG, "Interface initialization will be completed in a callback");
return 0;
}
return hostapd_setup_interface_complete(iface, 0);
ret = 0;
out:
return hostapd_setup_interface_complete(iface, ret);
}