HS 2.0: Add configuration for Hotspot 2.0 AP support

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

diff --git a/hostapd/Makefile b/hostapd/Makefile
index b43aa75aa12e971853ab241cbf3783a118540088..aed4b8905728a8259583f7fead5b505ad31e4f52 100644 (file)
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -770,6 +770,11 @@ CFLAGS += -DCONFIG_P2P_MANAGER
 OBJS += ../src/ap/p2p_hostapd.o
 endif
 
+ifdef CONFIG_HS20
+CFLAGS += -DCONFIG_HS20
+CONFIG_INTERWORKING=y
+endif
+
 ifdef CONFIG_INTERWORKING
 CFLAGS += -DCONFIG_INTERWORKING
 OBJS += ../src/common/gas.o

diff --git a/hostapd/config_file.c b/hostapd/config_file.c
index eebbaa68941d0561fa7f38d681ce14b4546135a4..9edc80ddb73749eefb6167a6574c1b8be5c58f60 100644 (file)
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
@@ -2439,6 +2439,10 @@ static int hostapd_config_fill(struct hostapd_config *conf,
                        os_free(bss->dump_msk_file);
                        bss->dump_msk_file = os_strdup(pos);
 #endif /* CONFIG_RADIUS_TEST */
+#ifdef CONFIG_HS20
+               } else if (os_strcmp(buf, "hs20") == 0) {
+                       bss->hs20 = atoi(pos);
+#endif /* CONFIG_HS20 */
                } else {
                        wpa_printf(MSG_ERROR, "Line %d: unknown configuration "
                                   "item '%s'", line, buf);

diff --git a/hostapd/defconfig b/hostapd/defconfig
index 9c5b13a42ce1cd3f4b6dd1cce8463e98d14546ee..f9655186affd686f7308e1a47e1aff1fff7a1ab1 100644 (file)
--- a/hostapd/defconfig
+++ b/hostapd/defconfig
@@ -257,3 +257,6 @@ CONFIG_IPV6=y
 # This can be used to enable functionality to improve interworking with
 # external networks.
 #CONFIG_INTERWORKING=y
+
+# Hotspot 2.0
+#CONFIG_HS20=y

diff --git a/hostapd/hostapd.conf b/hostapd/hostapd.conf
index 4d47bbd8064b235fc0b8117de224e0ad337ecc6e..48aae5316259408cabbbc4c9ba1b7363e1eee728 100644 (file)
--- a/hostapd/hostapd.conf
+++ b/hostapd/hostapd.conf
@@ -1325,6 +1325,11 @@ own_ip_addr=127.0.0.1
 #venue_name=eng:Example venue
 #venue_name=fin:Esimerkkipaikka
 
+##### Hotspot 2.0 #############################################################
+
+# Enable Hotspot 2.0 support
+#hs20=1
+
 ##### Multiple BSSID support ##################################################
 #
 # Above configuration is using the default interface (wlan#, or multi-SSID VLAN

diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
index ca4fe58c85de836e80c0ce1b7a8a24cec162cadd..e3834ade84e72cb420c4985e3e733529d1cc328b 100644 (file)
--- a/src/ap/ap_config.h
+++ b/src/ap/ap_config.h
@@ -394,6 +394,10 @@ struct hostapd_bss_config {
        u16 gas_comeback_delay;
        int gas_frag_limit;
 
+#ifdef CONFIG_HS20
+       int hs20;
+#endif /* CONFIG_HS20 */
+
        u8 wps_rf_bands; /* RF bands for WPS (WPS_RF_*) */
 
 #ifdef CONFIG_RADIUS_TEST