From: Jo-Philipp Wich <jo@mein.io>
Date: Sun, 19 Feb 2017 21:04:16 +0000 (+0100)
Subject: hostapd: fix feature indication
X-Git-Tag: v17.01.1~89
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=709c326461553a9a8e511021b8f283d056d499b8;p=openwrt%2Fstaging%2Fchunkeey.git

hostapd: fix feature indication

 - Fix eap test to work with standalone hostapd builds
 - Fix 11n test to check the correct define
 - Add 11ac, 11r and 11w tests

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/package/network/services/hostapd/src/src/utils/build_features.h b/package/network/services/hostapd/src/src/utils/build_features.h
index ffbb7978d9..315804361c 100644
--- a/package/network/services/hostapd/src/src/utils/build_features.h
+++ b/package/network/services/hostapd/src/src/utils/build_features.h
@@ -3,13 +3,25 @@
 
 static inline int has_feature(const char *feat)
 {
-#ifdef IEEE8021X_EAPOL
+#if defined(IEEE8021X_EAPOL) || (defined(HOSTAPD) && !defined(CONFIG_NO_RADIUS))
 	if (!strcmp(feat, "eap"))
 		return 1;
 #endif
-#ifdef IEEE80211N
+#ifdef CONFIG_IEEE80211N
 	if (!strcmp(feat, "11n"))
 		return 1;
+#endif
+#ifdef CONFIG_IEEE80211AC
+	if (!strcmp(feat, "11ac"))
+		return 1;
+#endif
+#ifdef CONFIG_IEEE80211R
+	if (!strcmp(feat, "11r"))
+		return 1;
+#endif
+#ifdef CONFIG_IEEE80211W
+	if (!strcmp(feat, "11w"))
+		return 1;
 #endif
 	return 0;
 }