commit 701194c5a19829a1a9145c837297f3b9c6d73437
author Linux Build Service Account <lnxbuild@localhost> Mon Feb 10 10:46:46 2020 -0800
committer Linux Build Service Account <lnxbuild@localhost> Mon Feb 10 10:46:46 2020 -0800
tree dbd54d845c352f03ce9a9c1fdb473373065cf921
parent b03a2ea9f4e60c1bf6646b89780c367a04ec3c02
parent 1b6053c5cdca6ef02fc970a17f47db8ad7007f32

Merge 1b6053c5cdca6ef02fc970a17f47db8ad7007f32 on remote branch

Change-Id: I62879cd722c4a9cbaf69538e4c9aab876125846c

softap/sdk/qsap_api.c

diff --git a/softap/sdk/qsap_api.c b/softap/sdk/qsap_api.c
index f1d81e5..064e499 100644
--- a/softap/sdk/qsap_api.c
+++ b/softap/sdk/qsap_api.c
@@ -91,7 +91,8 @@
 s8 *Conf_req[CONF_REQ_LAST] = {
     "dual2g",
     "dual5g",
-    "owe"
+    "owe",
+    "60g",
 };
 
 /*
@@ -188,6 +189,9 @@
     { "deny_mac_file",         NULL             },
     { "owe_transition_ifname", NULL             },
     { "sae_require_mfp",       NULL             },
+    { "ieee80211ax",           NULL             },
+    { "enable_edmg",           NULL             },
+    { "edmg_channel",          NULL             },
 
 };
 
@@ -2609,6 +2613,9 @@
     } else if (!(strncmp(pcmd, Conf_req[CONF_owe], strlen(Conf_req[CONF_owe])))) {
            pcmd += strlen(Conf_req[CONF_owe]);
            SKIP_BLANK_SPACE(pcmd);
+    } else if (!(strncmp(pcmd, Conf_req[CONF_60g], strlen(Conf_req[CONF_60g])))) {
+           pcmd += strlen(Conf_req[CONF_60g]);
+           SKIP_BLANK_SPACE(pcmd);
     } else {
 	    // DO NOTHING
     }
@@ -3185,6 +3192,8 @@
            pconffile = CONFIG_FILE_5G;
        } else if (!(strncmp(pcmd+4, Conf_req[CONF_owe], strlen(Conf_req[CONF_owe])))) {
            pconffile = CONFIG_FILE_OWE;
+       } else if (!(strncmp(pcmd+4, Conf_req[CONF_60g], strlen(Conf_req[CONF_60g])))) {
+           pconffile = CONFIG_FILE_60G;
        } else {
            pconffile = CONFIG_FILE;
        }
@@ -3243,10 +3252,11 @@
         ALOGD("ARG: %d - %s\n", i+1, argv[i]);
     }
 
-    // check if 2nd arg is dual2g/dual5g
+    // check if 2nd arg is dual2g/dual5g/owe/60g
     if (argc > 2
          && (strncmp(argv[2], Conf_req[CONF_2g], 4) == 0
-             || strncmp(argv[2], Conf_req[CONF_owe], 3) == 0)) {
+             || strncmp(argv[2], Conf_req[CONF_owe], 3) == 0
+             || strncmp(argv[2], Conf_req[CONF_60g], 3) == 0)) {
             snprintf(setCmd, SET_BUF_LEN, "set %s", argv[2]);
             offset = 1;
             argc--;

softap/sdk/qsap_api.h

diff --git a/softap/sdk/qsap_api.h b/softap/sdk/qsap_api.h
index 05af9c1..4ba55ec 100644
--- a/softap/sdk/qsap_api.h
+++ b/softap/sdk/qsap_api.h
@@ -91,6 +91,7 @@
 /** Configuration file name for SAP+SAP*/
 #define CONFIG_FILE_2G "/data/vendor/wifi/hostapd/hostapd_dual2g.conf"
 #define CONFIG_FILE_5G "/data/vendor/wifi/hostapd/hostapd_dual5g.conf"
+#define CONFIG_FILE_60G "/data/vendor/wifi/hostapd/hostapd_60g.conf"
 
 /** Configuration file name for OWE-transition */
 #define CONFIG_FILE_OWE "/data/vendor/wifi/hostapd/hostapd_owe.conf"
@@ -256,6 +257,7 @@
     CONF_2g = 0,
     CONF_5g = 1,
     CONF_owe = 2,
+    CONF_60g = 3,
 
     CONF_REQ_LAST
 };
@@ -361,6 +363,11 @@
     eCMD_OWE_TRANS_IFNAME    = 83,
     eCMD_SAE_REQUIRE_MPF     = 84,
 
+    eCMD_IEEE80211AX         = 85,
+
+    eCMD_ENABLE_EDMG         = 86,
+    eCMD_EDMG_CHANNEL        = 87,
+
     eCMD_LAST     /** New command numbers should be added above this */
 } esap_cmd_t;