hostapd: Add EDMG channel configuration parameters

Add two new configuration parameters for hostapd:
enable_edmg: Enable EDMG capability for AP mode in the 60 GHz band
edmg_channel: Configure channel bonding for AP mode in the 60 GHz band

Signed-off-by: Alexei Avshalom Lazar <ailizaro@codeaurora.org>

diff --git a/hostapd/config_file.c b/hostapd/config_file.c
index db9d582068d013f00fb88f3cdebe539fc2bfd456..cce5d35917aa65dc55c20e9ae47461d23aa7e505 100644 (file)
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
@@ -3150,6 +3150,10 @@ static int hostapd_config_fill(struct hostapd_config *conf,
                        conf->channel = atoi(pos);
                        conf->acs = conf->channel == 0;
                }
+       } else if (os_strcmp(buf, "edmg_channel") == 0) {
+               conf->edmg_channel = atoi(pos);
+       } else if (os_strcmp(buf, "enable_edmg") == 0) {
+               conf->enable_edmg = atoi(pos);
        } else if (os_strcmp(buf, "chanlist") == 0) {
                if (hostapd_parse_chanlist(conf, pos)) {
                        wpa_printf(MSG_ERROR, "Line %d: invalid channel list",

diff --git a/hostapd/hostapd.conf b/hostapd/hostapd.conf
index e6d84722971c2412cdcdc1fad657af38eaab4239..6f26578043ce78e1cd15dce70c0a26782197a9ba 100644 (file)
--- a/hostapd/hostapd.conf
+++ b/hostapd/hostapd.conf
@@ -2666,6 +2666,19 @@ own_ip_addr=127.0.0.1
 # airtime.
 #airtime_bss_limit=1
 
+##### EDMG support ############################################################
+#
+# Enable EDMG capability for AP mode in the 60 GHz band. Default value is false.
+# To configure channel bonding for an EDMG AP use edmg_channel below.
+# If enable_edmg is set and edmg_channel is not set, EDMG CB1 will be
+# configured.
+#enable_edmg=1
+#
+# Configure channel bonding for AP mode in the 60 GHz band.
+# This parameter is relevant only if enable_edmg is set.
+# Default value is 0 (no channel bonding).
+#edmg_channel=9
+
 ##### TESTING OPTIONS #########################################################
 #
 # The options in this section are only available when the build configuration

diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
index d6052e144a9686a9e4b770f142085cbee54c68f9..6b15a3ebdd066623ad8cd981b97ec12e324fad8d 100644 (file)
--- a/src/ap/ap_config.h
+++ b/src/ap/ap_config.h
@@ -872,6 +872,8 @@ struct hostapd_config {
        int rts_threshold;
        int fragm_threshold;
        u8 channel;
+       int enable_edmg;
+       u8 edmg_channel;
        u8 acs;
        struct wpa_freq_range_list acs_ch_list;
        int acs_exclude_dfs;