psmattas/android_system_qcom-lineage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 1b6053c5cd on remote branch

Browse Source 
Change-Id: I62879cd722c4a9cbaf69538e4c9aab876125846c
This commit is contained in:
Linux Build Service Account
2020-02-10 10:46:46 -08:00
parent b03a2ea9f4 1b6053c5cd
commit 701194c5a1
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
softap/sdk/qsap_api.c
View File

@@ -91,7 +91,8 @@ s8 *Cmd_req[eCMD_REQ_LAST] = {
s8 *Conf_req[CONF_REQ_LAST] = { s8 *Conf_req[CONF_REQ_LAST] = {
"dual2g", "dual2g",
"dual5g", "dual5g",
"owe" "owe",
"60g",
}; };
/* /*
@@ -188,6 +189,9 @@ static struct Command cmd_list[eCMD_LAST] = {
{ "deny_mac_file", NULL }, { "deny_mac_file", NULL },
{ "owe_transition_ifname", NULL }, { "owe_transition_ifname", NULL },
{ "sae_require_mfp", NULL }, { "sae_require_mfp", NULL },
{ "ieee80211ax", NULL },
{ "enable_edmg", NULL },
{ "edmg_channel", NULL },
}; };
@@ -2609,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])))) { } else if (!(strncmp(pcmd, Conf_req[CONF_owe], strlen(Conf_req[CONF_owe])))) {
pcmd += strlen(Conf_req[CONF_owe]); pcmd += strlen(Conf_req[CONF_owe]);
SKIP_BLANK_SPACE(pcmd); 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 { } else {
// DO NOTHING // DO NOTHING
} }
@@ -3185,6 +3192,8 @@ void qsap_hostd_exec_cmd(s8 *pcmd, s8 *presp, u32 *plen)
pconffile = CONFIG_FILE_5G; pconffile = CONFIG_FILE_5G;
} else if (!(strncmp(pcmd+4, Conf_req[CONF_owe], strlen(Conf_req[CONF_owe])))) { } else if (!(strncmp(pcmd+4, Conf_req[CONF_owe], strlen(Conf_req[CONF_owe])))) {
pconffile = CONFIG_FILE_OWE; pconffile = CONFIG_FILE_OWE;
} else if (!(strncmp(pcmd+4, Conf_req[CONF_60g], strlen(Conf_req[CONF_60g])))) {
pconffile = CONFIG_FILE_60G;
} else { } else {
pconffile = CONFIG_FILE; pconffile = CONFIG_FILE;
} }
@@ -3243,10 +3252,11 @@ int qsapsetSoftap(int argc, char *argv[])
ALOGD("ARG: %d - %s\n", i+1, argv[i]); 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 if (argc > 2
&& (strncmp(argv[2], Conf_req[CONF_2g], 4) == 0 && (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]); snprintf(setCmd, SET_BUF_LEN, "set %s", argv[2]);
offset = 1; offset = 1;
argc--; argc--;

7
softap/sdk/qsap_api.h
View File

@@ -91,6 +91,7 @@ enum error_val {
/** Configuration file name for SAP+SAP*/ /** Configuration file name for SAP+SAP*/
#define CONFIG_FILE_2G "/data/vendor/wifi/hostapd/hostapd_dual2g.conf" #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_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 */ /** Configuration file name for OWE-transition */
#define CONFIG_FILE_OWE "/data/vendor/wifi/hostapd/hostapd_owe.conf" #define CONFIG_FILE_OWE "/data/vendor/wifi/hostapd/hostapd_owe.conf"
@@ -256,6 +257,7 @@ enum eConf_req {
CONF_2g = 0, CONF_2g = 0,
CONF_5g = 1, CONF_5g = 1,
CONF_owe = 2, CONF_owe = 2,
CONF_60g = 3,
CONF_REQ_LAST CONF_REQ_LAST
}; };
@@ -361,6 +363,11 @@ typedef enum esap_cmd {
eCMD_OWE_TRANS_IFNAME = 83, eCMD_OWE_TRANS_IFNAME = 83,
eCMD_SAE_REQUIRE_MPF = 84, 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 */ eCMD_LAST /** New command numbers should be added above this */
} esap_cmd_t; } esap_cmd_t;