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

Merge 59c014ff95 on remote branch

Browse Source 
Change-Id: I7cd3744295ec99bf296247b73561d3d42b369394
This commit is contained in:
Linux Build Service Account
2019-11-12 20:08:29 -08:00
parent 62ae34e1a4 59c014ff95
commit b03a2ea9f4
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
softap/sdk/qsap_api.c
View File

@@ -215,7 +215,7 @@ struct Command qsap_str[eSTR_LAST] = {
/** Supported operating mode */ /** Supported operating mode */
char *hw_mode[HW_MODE_UNKNOWN] = { 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 */ /** configuration file path */
@@ -2515,6 +2515,10 @@ static int qsap_set_operating_mode(s32 mode, s8 *pmode, int pmode_len, s8 *tbuf,
ulen = *tlen; ulen = *tlen;
qsap_write_cfg(pcfg, &cmd_list[eCMD_IEEE80211N],ieee11n_disable, tbuf, &ulen, HOSTAPD_CONF_QCOM_FILE); qsap_write_cfg(pcfg, &cmd_list[eCMD_IEEE80211N],ieee11n_disable, tbuf, &ulen, HOSTAPD_CONF_QCOM_FILE);
break; 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 ) { 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]); qsap_scnprintf(pmode, pmode_len, "%s",hw_mode[HW_MODE_G]);

3
softap/sdk/qsap_api.h
View File

@@ -425,6 +425,7 @@ enum oper_mode {
HW_MODE_N_ONLY = 4, HW_MODE_N_ONLY = 4,
HW_MODE_A = 5, HW_MODE_A = 5,
HW_MODE_ANY = 6, HW_MODE_ANY = 6,
HW_MODE_AD = 7,
HW_MODE_UNKNOWN HW_MODE_UNKNOWN
}; };
@@ -535,7 +536,7 @@ typedef struct sap_auto_channel_info {
/** Validate the pairwise encryption */ /** Validate the pairwise encryption */
#define IS_VALID_PAIRWISE(x) (((!strcmp(x, "TKIP")) || (!strcmp(x, "CCMP")) || \ #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 */ /** Validate the WMM status */
#define IS_VALID_WMM_STATE(x) (((x >= WMM_AUTO_IN_INI) && (x <= WMM_DISABLED_IN_INI)) ? TRUE: FALSE) #define IS_VALID_WMM_STATE(x) (((x >= WMM_AUTO_IN_INI) && (x <= WMM_DISABLED_IN_INI)) ? TRUE: FALSE)