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

Merge e0c1c7780a on remote branch

Browse Source 
Change-Id: Idc3f12033916a1a0844ebfd33ba341d4d62e9f45
This commit is contained in:
Linux Build Service Account
2019-01-28 07:18:34 -08:00
parent b44cdad94e e0c1c7780a
commit 3728d9a42d
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
softap/sdk/qsap_api.c
View File

@@ -90,7 +90,8 @@ s8 *Cmd_req[eCMD_REQ_LAST] = {
*/ */
s8 *Conf_req[CONF_REQ_LAST] = { s8 *Conf_req[CONF_REQ_LAST] = {
"dual2g", "dual2g",
"dual5g" "dual5g",
"owe"
}; };
/* /*
@@ -185,6 +186,7 @@ static struct Command cmd_list[eCMD_LAST] = {
{ "wowlan_triggers", "any" }, { "wowlan_triggers", "any" },
{ "accept_mac_file", NULL }, { "accept_mac_file", NULL },
{ "deny_mac_file", NULL }, { "deny_mac_file", NULL },
{ "owe_transition_ifname", NULL },
}; };
@@ -2598,6 +2600,9 @@ static void qsap_handle_set_request(s8 *pcmd, s8 *presp, u32 *plen)
} else if (!(strncmp(pcmd, Conf_req[CONF_5g], strlen(Conf_req[CONF_5g])))) { } else if (!(strncmp(pcmd, Conf_req[CONF_5g], strlen(Conf_req[CONF_5g])))) {
pcmd += strlen(Conf_req[CONF_5g]); pcmd += strlen(Conf_req[CONF_5g]);
SKIP_BLANK_SPACE(pcmd); SKIP_BLANK_SPACE(pcmd);
} else if (!(strncmp(pcmd, Conf_req[CONF_owe], strlen(Conf_req[CONF_owe])))) {
pcmd += strlen(Conf_req[CONF_owe]);
SKIP_BLANK_SPACE(pcmd);
} else { } else {
// DO NOTHING // DO NOTHING
} }
@@ -3172,6 +3177,8 @@ void qsap_hostd_exec_cmd(s8 *pcmd, s8 *presp, u32 *plen)
pconffile = CONFIG_FILE_2G; pconffile = CONFIG_FILE_2G;
} else if (!(strncmp(pcmd+4, Conf_req[CONF_5g], strlen(Conf_req[CONF_5g])))) { } else if (!(strncmp(pcmd+4, Conf_req[CONF_5g], strlen(Conf_req[CONF_5g])))) {
pconffile = CONFIG_FILE_5G; pconffile = CONFIG_FILE_5G;
} else if (!(strncmp(pcmd+4, Conf_req[CONF_owe], strlen(Conf_req[CONF_owe])))) {
pconffile = CONFIG_FILE_OWE;
} else { } else {
pconffile = CONFIG_FILE; pconffile = CONFIG_FILE;
} }
@@ -3231,7 +3238,9 @@ int qsapsetSoftap(int argc, char *argv[])
} }
// check if 2nd arg is dual2g/dual5g // check if 2nd arg is dual2g/dual5g
if (argc > 2 && (strncmp(argv[2], Conf_req[CONF_2g], 4) == 0)) { if (argc > 2
&& (strncmp(argv[2], Conf_req[CONF_2g], 4) == 0
|| strncmp(argv[2], Conf_req[CONF_owe], 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--;

5
softap/sdk/qsap_api.h
View File

@@ -92,6 +92,9 @@ enum error_val {
#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"
/** Configuration file name for OWE-transition */
#define CONFIG_FILE_OWE "/data/vendor/wifi/hostapd/hostapd_owe.conf"
/** Configuration file name */ /** Configuration file name */
#define CONFIG_FILE "/data/vendor/wifi/hostapd/hostapd.conf" #define CONFIG_FILE "/data/vendor/wifi/hostapd/hostapd.conf"
@@ -252,6 +255,7 @@ enum eCmd_req {
enum eConf_req { enum eConf_req {
CONF_2g = 0, CONF_2g = 0,
CONF_5g = 1, CONF_5g = 1,
CONF_owe = 2,
CONF_REQ_LAST CONF_REQ_LAST
}; };
@@ -354,6 +358,7 @@ typedef enum esap_cmd {
eCMD_WOWLAN_TRIGGERS = 80, eCMD_WOWLAN_TRIGGERS = 80,
eCMD_ACCEPT_MAC_FILE = 81, eCMD_ACCEPT_MAC_FILE = 81,
eCMD_DENY_MAC_FILE = 82, eCMD_DENY_MAC_FILE = 82,
eCMD_OWE_TRANS_IFNAME = 83,
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;