Browse Source

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 <helmut.schaa@googlemail.com>
Helmut Schaa 11 years ago
parent
commit
770ecdf27c
1 changed files with 5 additions and 2 deletions
  1. 5 2
      src/ap/acs.c

+ 5 - 2
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);
 }