softap: sdk: Add 'vendor.' prefix to wlan.driver.config

* In 126af66b04,
  the prop wlan.driver.config was renamed to vendor.wlan.driver.config.
  Therefore, make the same change on softap as well.

Change-Id: I696d851c8ecd35ec42cf680149c402b3b8044cfc

softap/sdk/qsap_api.c

@@ -91,7 +91,8 @@ s8 *Cmd_req[eCMD_REQ_LAST] = {
 s8 *Conf_req[CONF_REQ_LAST] = {
     "dual2g",
     "dual5g",
-    "owe"
+    "owe",
+    "60g",
 };
 
 /*
@@ -188,6 +189,9 @@ static struct Command cmd_list[eCMD_LAST] = {
     { "deny_mac_file",         NULL             },
     { "owe_transition_ifname", NULL             },
     { "sae_require_mfp",       NULL             },
+    { "ieee80211ax",           NULL             },
+    { "enable_edmg",           NULL             },
+    { "edmg_channel",          NULL             },
 
 };
 
@@ -215,7 +219,7 @@ struct Command qsap_str[eSTR_LAST] = {
 
 /** Supported operating mode */
 char *hw_mode[HW_MODE_UNKNOWN] = {
-    "b", "g", "n", "g-only", "n-only", "a", "any"
+    "b", "g", "n", "g-only", "n-only", "a", "any", "ad"
 };
 
 /** configuration file path */
@@ -2515,6 +2519,10 @@ static int qsap_set_operating_mode(s32 mode, s8 *pmode, int pmode_len, s8 *tbuf,
             ulen = *tlen;
             qsap_write_cfg(pcfg, &cmd_list[eCMD_IEEE80211N],ieee11n_disable, tbuf, &ulen, HOSTAPD_CONF_QCOM_FILE);
             break;
+        case HW_MODE_AD:
+            /** For 802.11ad, disable the 802.11 HT */
+            qsap_change_cfg(pcfg, &cmd_list[eCMD_HT_CAPAB], DISABLE);
+            break;
     }
     if(mode == HW_MODE_G_ONLY || mode == HW_MODE_N_ONLY || mode == HW_MODE_N ) {
         qsap_scnprintf(pmode, pmode_len, "%s",hw_mode[HW_MODE_G]);
@@ -2605,6 +2613,9 @@ static void qsap_handle_set_request(s8 *pcmd, s8 *presp, u32 *plen)
     } 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
     }
@@ -3181,6 +3192,8 @@ void qsap_hostd_exec_cmd(s8 *pcmd, s8 *presp, u32 *plen)
            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;
        }
@@ -3239,10 +3252,11 @@ int qsapsetSoftap(int argc, char *argv[])
         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

@@ -91,6 +91,7 @@ enum error_val {
 /** 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 @@ enum eConf_req {
     CONF_2g = 0,
     CONF_5g = 1,
     CONF_owe = 2,
+    CONF_60g = 3,
 
     CONF_REQ_LAST
 };
@@ -361,6 +363,11 @@ typedef enum esap_cmd {
     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;
 
@@ -425,6 +432,7 @@ enum oper_mode {
     HW_MODE_N_ONLY = 4,
     HW_MODE_A = 5,
     HW_MODE_ANY = 6,
+    HW_MODE_AD = 7,
 
     HW_MODE_UNKNOWN
 };
@@ -535,7 +543,7 @@ typedef struct sap_auto_channel_info {
 
 /** Validate the pairwise encryption */
 #define IS_VALID_PAIRWISE(x) (((!strcmp(x, "TKIP")) || (!strcmp(x, "CCMP")) || \
-                    (!strcmp(x, "TKIP CCMP")) || (!strcmp(x, "CCMP TKIP"))) ? TRUE : FALSE)
+                    (!strcmp(x, "TKIP CCMP")) || (!strcmp(x, "CCMP TKIP")) || (!strcmp(x, "GCMP"))) ? TRUE : FALSE)
 
 /** Validate the WMM status */
 #define IS_VALID_WMM_STATE(x) (((x >= WMM_AUTO_IN_INI) && (x <= WMM_DISABLED_IN_INI)) ? TRUE: FALSE)