From 770ecdf27cb8c5226a9e7b22df65f4e2e116ac31 Mon Sep 17 00:00:00 2001 From: Helmut Schaa Date: Thu, 31 Oct 2013 14:54:55 +0200 Subject: [PATCH] ACS: Do not get stuck while failing to do a subsequent scan Return control flow to hostapd by calling hostapd_acs_completed() if requesting a scan from the underlying device fails. Signed-hostapd: Helmut Schaa --- src/ap/acs.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/ap/acs.c b/src/ap/acs.c index 019b334fd..d7c921d32 100644 --- a/src/ap/acs.c +++ b/src/ap/acs.c @@ -729,14 +729,17 @@ static void acs_scan_complete(struct hostapd_iface *iface) err = acs_request_scan(iface); if (err) { wpa_printf(MSG_ERROR, "ACS: Failed to request scan"); - acs_fail(iface); - return; + goto fail; } return; } acs_study(iface); + return; +fail: + hostapd_acs_completed(iface, 1); + acs_fail(iface); }