From: Jouni Malinen <jouni@qca.qualcomm.com>
Date: Fri, 25 Apr 2014 20:43:00 +0000 (+0300)
Subject: ACS: Clean up ifdef CONFIG_ACS to avoid unreachable code
X-Git-Tag: hostap_2_2~221
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9670f8773bd44de401d7782fe887aa581a5ebffc;p=thirdparty%2Fhostap.git

ACS: Clean up ifdef CONFIG_ACS to avoid unreachable code

The conf->channel assignment was unreachable if CONFIG_ACS was not
defined, so move that to be under #else.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
---

diff --git a/hostapd/config_file.c b/hostapd/config_file.c
index 5f8428105..c65d384a7 100644
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
@@ -2445,8 +2445,9 @@ static int hostapd_config_fill(struct hostapd_config *conf,
 			wpa_printf(MSG_ERROR, "Line %d: tries to enable ACS but CONFIG_ACS disabled",
 				   line);
 			return 1;
-#endif /* CONFIG_ACS */
+#else /* CONFIG_ACS */
 			conf->channel = 0;
+#endif /* CONFIG_ACS */
 		} else
 			conf->channel = atoi(pos);
 	} else if (os_strcmp(buf, "chanlist") == 0) {