Skip to content

L
linux
Commit 02ae2bdf authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman
Browse files
Options

staging: wilc1000: rename strHostIFCfgParamAttr of fuction Handle_CfgParam 

This patch renames strHostIFCfgParamAttr of fuction Handle_CfgParam
to cfg_param_attr to avoid CamelCase naming convention.
Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7f0ee9a6
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 71 deletions
drivers/staging/wilc1000/host_interface.c
View file @ 02ae2bdf
...@@ -519,7 +519,7 @@ static s32 Handle_GetMacAddress(struct host_if_drv *hif_drv, ...@@ -519,7 +519,7 @@ static s32 Handle_GetMacAddress(struct host_if_drv *hif_drv,
} }
static s32 Handle_CfgParam(struct host_if_drv *hif_drv, static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
struct cfg_param_attr *strHostIFCfgParamAttr) struct cfg_param_attr *cfg_param_attr)
{ {
s32 result = 0; s32 result = 0;
struct wid strWIDList[32]; struct wid strWIDList[32];
...@@ -529,13 +529,13 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv, ...@@ -529,13 +529,13 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
PRINT_D(HOSTINF_DBG, "Setting CFG params\n"); PRINT_D(HOSTINF_DBG, "Setting CFG params\n");
if (strHostIFCfgParamAttr->cfg_attr_info.flag & BSS_TYPE) { if (cfg_param_attr->cfg_attr_info.flag & BSS_TYPE) {
if (strHostIFCfgParamAttr->cfg_attr_info.bss_type < 6) { if (cfg_param_attr->cfg_attr_info.bss_type < 6) {
strWIDList[u8WidCnt].id = WID_BSS_TYPE; strWIDList[u8WidCnt].id = WID_BSS_TYPE;
strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->cfg_attr_info.bss_type; strWIDList[u8WidCnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.bss_type;
strWIDList[u8WidCnt].type = WID_CHAR; strWIDList[u8WidCnt].type = WID_CHAR;
strWIDList[u8WidCnt].size = sizeof(char); strWIDList[u8WidCnt].size = sizeof(char);
hif_drv->cfg_values.bss_type = (u8)strHostIFCfgParamAttr->cfg_attr_info.bss_type; hif_drv->cfg_values.bss_type = (u8)cfg_param_attr->cfg_attr_info.bss_type;
} else { } else {
PRINT_ER("check value 6 over\n"); PRINT_ER("check value 6 over\n");
result = -EINVAL; result = -EINVAL;
...@@ -543,13 +543,15 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv, ...@@ -543,13 +543,15 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
} }
u8WidCnt++; u8WidCnt++;
} }
if (strHostIFCfgParamAttr->cfg_attr_info.flag & AUTH_TYPE) { if (cfg_param_attr->cfg_attr_info.flag & AUTH_TYPE) {
if ((strHostIFCfgParamAttr->cfg_attr_info.auth_type) == 1 || (strHostIFCfgParamAttr->cfg_attr_info.auth_type) == 2 || (strHostIFCfgParamAttr->cfg_attr_info.auth_type) == 5) { if (cfg_param_attr->cfg_attr_info.auth_type == 1 ||
cfg_param_attr->cfg_attr_info.auth_type == 2 ||
cfg_param_attr->cfg_attr_info.auth_type == 5) {
strWIDList[u8WidCnt].id = WID_AUTH_TYPE; strWIDList[u8WidCnt].id = WID_AUTH_TYPE;
strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->cfg_attr_info.auth_type; strWIDList[u8WidCnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.auth_type;
strWIDList[u8WidCnt].type = WID_CHAR; strWIDList[u8WidCnt].type = WID_CHAR;
strWIDList[u8WidCnt].size = sizeof(char); strWIDList[u8WidCnt].size = sizeof(char);
hif_drv->cfg_values.auth_type = (u8)strHostIFCfgParamAttr->cfg_attr_info.auth_type; hif_drv->cfg_values.auth_type = (u8)cfg_param_attr->cfg_attr_info.auth_type;
} else { } else {
PRINT_ER("Impossible value \n"); PRINT_ER("Impossible value \n");
result = -EINVAL; result = -EINVAL;
...@@ -557,13 +559,14 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv, ...@@ -557,13 +559,14 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
} }
u8WidCnt++; u8WidCnt++;
} }
if (strHostIFCfgParamAttr->cfg_attr_info.flag & AUTHEN_TIMEOUT) { if (cfg_param_attr->cfg_attr_info.flag & AUTHEN_TIMEOUT) {
if (strHostIFCfgParamAttr->cfg_attr_info.auth_timeout > 0 && strHostIFCfgParamAttr->cfg_attr_info.auth_timeout < 65536) { if (cfg_param_attr->cfg_attr_info.auth_timeout > 0 &&
cfg_param_attr->cfg_attr_info.auth_timeout < 65536) {
strWIDList[u8WidCnt].id = WID_AUTH_TIMEOUT; strWIDList[u8WidCnt].id = WID_AUTH_TIMEOUT;
strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->cfg_attr_info.auth_timeout; strWIDList[u8WidCnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.auth_timeout;
strWIDList[u8WidCnt].type = WID_SHORT; strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].size = sizeof(u16); strWIDList[u8WidCnt].size = sizeof(u16);
hif_drv->cfg_values.auth_timeout = strHostIFCfgParamAttr->cfg_attr_info.auth_timeout; hif_drv->cfg_values.auth_timeout = cfg_param_attr->cfg_attr_info.auth_timeout;
} else { } else {
PRINT_ER("Range(1 ~ 65535) over\n"); PRINT_ER("Range(1 ~ 65535) over\n");
result = -EINVAL; result = -EINVAL;
...@@ -571,13 +574,13 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv, ...@@ -571,13 +574,13 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
} }
u8WidCnt++; u8WidCnt++;
} }
if (strHostIFCfgParamAttr->cfg_attr_info.flag & POWER_MANAGEMENT) { if (cfg_param_attr->cfg_attr_info.flag & POWER_MANAGEMENT) {
if (strHostIFCfgParamAttr->cfg_attr_info.power_mgmt_mode < 5) { if (cfg_param_attr->cfg_attr_info.power_mgmt_mode < 5) {
strWIDList[u8WidCnt].id = WID_POWER_MANAGEMENT; strWIDList[u8WidCnt].id = WID_POWER_MANAGEMENT;
strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->cfg_attr_info.power_mgmt_mode; strWIDList[u8WidCnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.power_mgmt_mode;
strWIDList[u8WidCnt].type = WID_CHAR; strWIDList[u8WidCnt].type = WID_CHAR;
strWIDList[u8WidCnt].size = sizeof(char); strWIDList[u8WidCnt].size = sizeof(char);
hif_drv->cfg_values.power_mgmt_mode = (u8)strHostIFCfgParamAttr->cfg_attr_info.power_mgmt_mode; hif_drv->cfg_values.power_mgmt_mode = (u8)cfg_param_attr->cfg_attr_info.power_mgmt_mode;
} else { } else {
PRINT_ER("Invalide power mode\n"); PRINT_ER("Invalide power mode\n");
result = -EINVAL; result = -EINVAL;
...@@ -585,13 +588,14 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv, ...@@ -585,13 +588,14 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
} }
u8WidCnt++; u8WidCnt++;
} }
if (strHostIFCfgParamAttr->cfg_attr_info.flag & RETRY_SHORT) { if (cfg_param_attr->cfg_attr_info.flag & RETRY_SHORT) {
if ((strHostIFCfgParamAttr->cfg_attr_info.short_retry_limit > 0) && (strHostIFCfgParamAttr->cfg_attr_info.short_retry_limit < 256)) { if (cfg_param_attr->cfg_attr_info.short_retry_limit > 0 &&
cfg_param_attr->cfg_attr_info.short_retry_limit < 256) {
strWIDList[u8WidCnt].id = WID_SHORT_RETRY_LIMIT; strWIDList[u8WidCnt].id = WID_SHORT_RETRY_LIMIT;
strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->cfg_attr_info.short_retry_limit; strWIDList[u8WidCnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.short_retry_limit;
strWIDList[u8WidCnt].type = WID_SHORT; strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].size = sizeof(u16); strWIDList[u8WidCnt].size = sizeof(u16);
hif_drv->cfg_values.short_retry_limit = strHostIFCfgParamAttr->cfg_attr_info.short_retry_limit; hif_drv->cfg_values.short_retry_limit = cfg_param_attr->cfg_attr_info.short_retry_limit;
} else { } else {
PRINT_ER("Range(1~256) over\n"); PRINT_ER("Range(1~256) over\n");
result = -EINVAL; result = -EINVAL;
...@@ -599,14 +603,15 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv, ...@@ -599,14 +603,15 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
} }
u8WidCnt++; u8WidCnt++;
} }
if (strHostIFCfgParamAttr->cfg_attr_info.flag & RETRY_LONG) { if (cfg_param_attr->cfg_attr_info.flag & RETRY_LONG) {
if ((strHostIFCfgParamAttr->cfg_attr_info.long_retry_limit > 0) && (strHostIFCfgParamAttr->cfg_attr_info.long_retry_limit < 256)) { if (cfg_param_attr->cfg_attr_info.long_retry_limit > 0 &&
cfg_param_attr->cfg_attr_info.long_retry_limit < 256) {
strWIDList[u8WidCnt].id = WID_LONG_RETRY_LIMIT; strWIDList[u8WidCnt].id = WID_LONG_RETRY_LIMIT;
strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->cfg_attr_info.long_retry_limit; strWIDList[u8WidCnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.long_retry_limit;
strWIDList[u8WidCnt].type = WID_SHORT; strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].size = sizeof(u16); strWIDList[u8WidCnt].size = sizeof(u16);
hif_drv->cfg_values.long_retry_limit = strHostIFCfgParamAttr->cfg_attr_info.long_retry_limit; hif_drv->cfg_values.long_retry_limit = cfg_param_attr->cfg_attr_info.long_retry_limit;
} else { } else {
PRINT_ER("Range(1~256) over\n"); PRINT_ER("Range(1~256) over\n");
result = -EINVAL; result = -EINVAL;
...@@ -614,13 +619,14 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv, ...@@ -614,13 +619,14 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
} }
u8WidCnt++; u8WidCnt++;
} }
if (strHostIFCfgParamAttr->cfg_attr_info.flag & FRAG_THRESHOLD) { if (cfg_param_attr->cfg_attr_info.flag & FRAG_THRESHOLD) {
if (strHostIFCfgParamAttr->cfg_attr_info.frag_threshold > 255 && strHostIFCfgParamAttr->cfg_attr_info.frag_threshold < 7937) { if (cfg_param_attr->cfg_attr_info.frag_threshold > 255 &&
cfg_param_attr->cfg_attr_info.frag_threshold < 7937) {
strWIDList[u8WidCnt].id = WID_FRAG_THRESHOLD; strWIDList[u8WidCnt].id = WID_FRAG_THRESHOLD;
strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->cfg_attr_info.frag_threshold; strWIDList[u8WidCnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.frag_threshold;
strWIDList[u8WidCnt].type = WID_SHORT; strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].size = sizeof(u16); strWIDList[u8WidCnt].size = sizeof(u16);
hif_drv->cfg_values.frag_threshold = strHostIFCfgParamAttr->cfg_attr_info.frag_threshold; hif_drv->cfg_values.frag_threshold = cfg_param_attr->cfg_attr_info.frag_threshold;
} else { } else {
PRINT_ER("Threshold Range fail\n"); PRINT_ER("Threshold Range fail\n");
result = -EINVAL; result = -EINVAL;
...@@ -628,13 +634,14 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv, ...@@ -628,13 +634,14 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
} }
u8WidCnt++; u8WidCnt++;
} }
if (strHostIFCfgParamAttr->cfg_attr_info.flag & RTS_THRESHOLD) { if (cfg_param_attr->cfg_attr_info.flag & RTS_THRESHOLD) {
if (strHostIFCfgParamAttr->cfg_attr_info.rts_threshold > 255 && strHostIFCfgParamAttr->cfg_attr_info.rts_threshold < 65536) { if (cfg_param_attr->cfg_attr_info.rts_threshold > 255 &&
cfg_param_attr->cfg_attr_info.rts_threshold < 65536) {
strWIDList[u8WidCnt].id = WID_RTS_THRESHOLD; strWIDList[u8WidCnt].id = WID_RTS_THRESHOLD;
strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->cfg_attr_info.rts_threshold; strWIDList[u8WidCnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.rts_threshold;
strWIDList[u8WidCnt].type = WID_SHORT; strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].size = sizeof(u16); strWIDList[u8WidCnt].size = sizeof(u16);
hif_drv->cfg_values.rts_threshold = strHostIFCfgParamAttr->cfg_attr_info.rts_threshold; hif_drv->cfg_values.rts_threshold = cfg_param_attr->cfg_attr_info.rts_threshold;
} else { } else {
PRINT_ER("Threshold Range fail\n"); PRINT_ER("Threshold Range fail\n");
result = -EINVAL; result = -EINVAL;
...@@ -642,13 +649,13 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv, ...@@ -642,13 +649,13 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
} }
u8WidCnt++; u8WidCnt++;
} }
if (strHostIFCfgParamAttr->cfg_attr_info.flag & PREAMBLE) { if (cfg_param_attr->cfg_attr_info.flag & PREAMBLE) {
if (strHostIFCfgParamAttr->cfg_attr_info.preamble_type < 3) { if (cfg_param_attr->cfg_attr_info.preamble_type < 3) {
strWIDList[u8WidCnt].id = WID_PREAMBLE; strWIDList[u8WidCnt].id = WID_PREAMBLE;
strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->cfg_attr_info.preamble_type; strWIDList[u8WidCnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.preamble_type;
strWIDList[u8WidCnt].type = WID_CHAR; strWIDList[u8WidCnt].type = WID_CHAR;
strWIDList[u8WidCnt].size = sizeof(char); strWIDList[u8WidCnt].size = sizeof(char);
hif_drv->cfg_values.preamble_type = strHostIFCfgParamAttr->cfg_attr_info.preamble_type; hif_drv->cfg_values.preamble_type = cfg_param_attr->cfg_attr_info.preamble_type;
} else { } else {
PRINT_ER("Preamle Range(0~2) over\n"); PRINT_ER("Preamle Range(0~2) over\n");
result = -EINVAL; result = -EINVAL;
...@@ -656,13 +663,13 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv, ...@@ -656,13 +663,13 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
} }
u8WidCnt++; u8WidCnt++;
} }
if (strHostIFCfgParamAttr->cfg_attr_info.flag & SHORT_SLOT_ALLOWED) { if (cfg_param_attr->cfg_attr_info.flag & SHORT_SLOT_ALLOWED) {
if (strHostIFCfgParamAttr->cfg_attr_info.short_slot_allowed < 2) { if (cfg_param_attr->cfg_attr_info.short_slot_allowed < 2) {
strWIDList[u8WidCnt].id = WID_SHORT_SLOT_ALLOWED; strWIDList[u8WidCnt].id = WID_SHORT_SLOT_ALLOWED;
strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->cfg_attr_info.short_slot_allowed; strWIDList[u8WidCnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.short_slot_allowed;
strWIDList[u8WidCnt].type = WID_CHAR; strWIDList[u8WidCnt].type = WID_CHAR;
strWIDList[u8WidCnt].size = sizeof(char); strWIDList[u8WidCnt].size = sizeof(char);
hif_drv->cfg_values.short_slot_allowed = (u8)strHostIFCfgParamAttr->cfg_attr_info.short_slot_allowed; hif_drv->cfg_values.short_slot_allowed = (u8)cfg_param_attr->cfg_attr_info.short_slot_allowed;
} else { } else {
PRINT_ER("Short slot(2) over\n"); PRINT_ER("Short slot(2) over\n");
result = -EINVAL; result = -EINVAL;
...@@ -670,13 +677,13 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv, ...@@ -670,13 +677,13 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
} }
u8WidCnt++; u8WidCnt++;
} }
if (strHostIFCfgParamAttr->cfg_attr_info.flag & TXOP_PROT_DISABLE) { if (cfg_param_attr->cfg_attr_info.flag & TXOP_PROT_DISABLE) {
if (strHostIFCfgParamAttr->cfg_attr_info.txop_prot_disabled < 2) { if (cfg_param_attr->cfg_attr_info.txop_prot_disabled < 2) {
strWIDList[u8WidCnt].id = WID_11N_TXOP_PROT_DISABLE; strWIDList[u8WidCnt].id = WID_11N_TXOP_PROT_DISABLE;
strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->cfg_attr_info.txop_prot_disabled; strWIDList[u8WidCnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.txop_prot_disabled;
strWIDList[u8WidCnt].type = WID_CHAR; strWIDList[u8WidCnt].type = WID_CHAR;
strWIDList[u8WidCnt].size = sizeof(char); strWIDList[u8WidCnt].size = sizeof(char);
hif_drv->cfg_values.txop_prot_disabled = (u8)strHostIFCfgParamAttr->cfg_attr_info.txop_prot_disabled; hif_drv->cfg_values.txop_prot_disabled = (u8)cfg_param_attr->cfg_attr_info.txop_prot_disabled;
} else { } else {
PRINT_ER("TXOP prot disable\n"); PRINT_ER("TXOP prot disable\n");
result = -EINVAL; result = -EINVAL;
...@@ -684,13 +691,14 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv, ...@@ -684,13 +691,14 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
} }
u8WidCnt++; u8WidCnt++;
} }
if (strHostIFCfgParamAttr->cfg_attr_info.flag & BEACON_INTERVAL) { if (cfg_param_attr->cfg_attr_info.flag & BEACON_INTERVAL) {
if (strHostIFCfgParamAttr->cfg_attr_info.beacon_interval > 0 && strHostIFCfgParamAttr->cfg_attr_info.beacon_interval < 65536) { if (cfg_param_attr->cfg_attr_info.beacon_interval > 0 &&
cfg_param_attr->cfg_attr_info.beacon_interval < 65536) {
strWIDList[u8WidCnt].id = WID_BEACON_INTERVAL; strWIDList[u8WidCnt].id = WID_BEACON_INTERVAL;
strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->cfg_attr_info.beacon_interval; strWIDList[u8WidCnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.beacon_interval;
strWIDList[u8WidCnt].type = WID_SHORT; strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].size = sizeof(u16); strWIDList[u8WidCnt].size = sizeof(u16);
hif_drv->cfg_values.beacon_interval = strHostIFCfgParamAttr->cfg_attr_info.beacon_interval; hif_drv->cfg_values.beacon_interval = cfg_param_attr->cfg_attr_info.beacon_interval;
} else { } else {
PRINT_ER("Beacon interval(1~65535) fail\n"); PRINT_ER("Beacon interval(1~65535) fail\n");
result = -EINVAL; result = -EINVAL;
...@@ -698,13 +706,14 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv, ...@@ -698,13 +706,14 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
} }
u8WidCnt++; u8WidCnt++;
} }
if (strHostIFCfgParamAttr->cfg_attr_info.flag & DTIM_PERIOD) { if (cfg_param_attr->cfg_attr_info.flag & DTIM_PERIOD) {
if (strHostIFCfgParamAttr->cfg_attr_info.dtim_period > 0 && strHostIFCfgParamAttr->cfg_attr_info.dtim_period < 256) { if (cfg_param_attr->cfg_attr_info.dtim_period > 0 &&
cfg_param_attr->cfg_attr_info.dtim_period < 256) {
strWIDList[u8WidCnt].id = WID_DTIM_PERIOD; strWIDList[u8WidCnt].id = WID_DTIM_PERIOD;
strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->cfg_attr_info.dtim_period; strWIDList[u8WidCnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.dtim_period;
strWIDList[u8WidCnt].type = WID_CHAR; strWIDList[u8WidCnt].type = WID_CHAR;
strWIDList[u8WidCnt].size = sizeof(char); strWIDList[u8WidCnt].size = sizeof(char);
hif_drv->cfg_values.dtim_period = strHostIFCfgParamAttr->cfg_attr_info.dtim_period; hif_drv->cfg_values.dtim_period = cfg_param_attr->cfg_attr_info.dtim_period;
} else { } else {
PRINT_ER("DTIM range(1~255) fail\n"); PRINT_ER("DTIM range(1~255) fail\n");
result = -EINVAL; result = -EINVAL;
...@@ -712,13 +721,13 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv, ...@@ -712,13 +721,13 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
} }
u8WidCnt++; u8WidCnt++;
} }
if (strHostIFCfgParamAttr->cfg_attr_info.flag & SITE_SURVEY) { if (cfg_param_attr->cfg_attr_info.flag & SITE_SURVEY) {
if (strHostIFCfgParamAttr->cfg_attr_info.site_survey_enabled < 3) { if (cfg_param_attr->cfg_attr_info.site_survey_enabled < 3) {
strWIDList[u8WidCnt].id = WID_SITE_SURVEY; strWIDList[u8WidCnt].id = WID_SITE_SURVEY;
strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->cfg_attr_info.site_survey_enabled; strWIDList[u8WidCnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.site_survey_enabled;
strWIDList[u8WidCnt].type = WID_CHAR; strWIDList[u8WidCnt].type = WID_CHAR;
strWIDList[u8WidCnt].size = sizeof(char); strWIDList[u8WidCnt].size = sizeof(char);
hif_drv->cfg_values.site_survey_enabled = (u8)strHostIFCfgParamAttr->cfg_attr_info.site_survey_enabled; hif_drv->cfg_values.site_survey_enabled = (u8)cfg_param_attr->cfg_attr_info.site_survey_enabled;
} else { } else {
PRINT_ER("Site survey disable\n"); PRINT_ER("Site survey disable\n");
result = -EINVAL; result = -EINVAL;
...@@ -726,13 +735,14 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv, ...@@ -726,13 +735,14 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
} }
u8WidCnt++; u8WidCnt++;
} }
if (strHostIFCfgParamAttr->cfg_attr_info.flag & SITE_SURVEY_SCAN_TIME) { if (cfg_param_attr->cfg_attr_info.flag & SITE_SURVEY_SCAN_TIME) {
if (strHostIFCfgParamAttr->cfg_attr_info.site_survey_scan_time > 0 && strHostIFCfgParamAttr->cfg_attr_info.site_survey_scan_time < 65536) { if (cfg_param_attr->cfg_attr_info.site_survey_scan_time > 0 &&
cfg_param_attr->cfg_attr_info.site_survey_scan_time < 65536) {
strWIDList[u8WidCnt].id = WID_SITE_SURVEY_SCAN_TIME; strWIDList[u8WidCnt].id = WID_SITE_SURVEY_SCAN_TIME;
strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->cfg_attr_info.site_survey_scan_time; strWIDList[u8WidCnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.site_survey_scan_time;
strWIDList[u8WidCnt].type = WID_SHORT; strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].size = sizeof(u16); strWIDList[u8WidCnt].size = sizeof(u16);
hif_drv->cfg_values.site_survey_scan_time = strHostIFCfgParamAttr->cfg_attr_info.site_survey_scan_time; hif_drv->cfg_values.site_survey_scan_time = cfg_param_attr->cfg_attr_info.site_survey_scan_time;
} else { } else {
PRINT_ER("Site survey scan time(1~65535) over\n"); PRINT_ER("Site survey scan time(1~65535) over\n");
result = -EINVAL; result = -EINVAL;
...@@ -740,13 +750,14 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv, ...@@ -740,13 +750,14 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
} }
u8WidCnt++; u8WidCnt++;
} }
if (strHostIFCfgParamAttr->cfg_attr_info.flag & ACTIVE_SCANTIME) { if (cfg_param_attr->cfg_attr_info.flag & ACTIVE_SCANTIME) {
if (strHostIFCfgParamAttr->cfg_attr_info.active_scan_time > 0 && strHostIFCfgParamAttr->cfg_attr_info.active_scan_time < 65536) { if (cfg_param_attr->cfg_attr_info.active_scan_time > 0 &&
cfg_param_attr->cfg_attr_info.active_scan_time < 65536) {
strWIDList[u8WidCnt].id = WID_ACTIVE_SCAN_TIME; strWIDList[u8WidCnt].id = WID_ACTIVE_SCAN_TIME;
strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->cfg_attr_info.active_scan_time; strWIDList[u8WidCnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.active_scan_time;
strWIDList[u8WidCnt].type = WID_SHORT; strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].size = sizeof(u16); strWIDList[u8WidCnt].size = sizeof(u16);
hif_drv->cfg_values.active_scan_time = strHostIFCfgParamAttr->cfg_attr_info.active_scan_time; hif_drv->cfg_values.active_scan_time = cfg_param_attr->cfg_attr_info.active_scan_time;
} else { } else {
PRINT_ER("Active scan time(1~65535) over\n"); PRINT_ER("Active scan time(1~65535) over\n");
result = -EINVAL; result = -EINVAL;
...@@ -754,13 +765,14 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv, ...@@ -754,13 +765,14 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
} }
u8WidCnt++; u8WidCnt++;
} }
if (strHostIFCfgParamAttr->cfg_attr_info.flag & PASSIVE_SCANTIME) { if (cfg_param_attr->cfg_attr_info.flag & PASSIVE_SCANTIME) {
if (strHostIFCfgParamAttr->cfg_attr_info.passive_scan_time > 0 && strHostIFCfgParamAttr->cfg_attr_info.passive_scan_time < 65536) { if (cfg_param_attr->cfg_attr_info.passive_scan_time > 0 &&
cfg_param_attr->cfg_attr_info.passive_scan_time < 65536) {
strWIDList[u8WidCnt].id = WID_PASSIVE_SCAN_TIME; strWIDList[u8WidCnt].id = WID_PASSIVE_SCAN_TIME;
strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->cfg_attr_info.passive_scan_time; strWIDList[u8WidCnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.passive_scan_time;
strWIDList[u8WidCnt].type = WID_SHORT; strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].size = sizeof(u16); strWIDList[u8WidCnt].size = sizeof(u16);
hif_drv->cfg_values.passive_scan_time = strHostIFCfgParamAttr->cfg_attr_info.passive_scan_time; hif_drv->cfg_values.passive_scan_time = cfg_param_attr->cfg_attr_info.passive_scan_time;
} else { } else {
PRINT_ER("Passive scan time(1~65535) over\n"); PRINT_ER("Passive scan time(1~65535) over\n");
result = -EINVAL; result = -EINVAL;
...@@ -768,8 +780,8 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv, ...@@ -768,8 +780,8 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
} }
u8WidCnt++; u8WidCnt++;
} }
if (strHostIFCfgParamAttr->cfg_attr_info.flag & CURRENT_TX_RATE) { if (cfg_param_attr->cfg_attr_info.flag & CURRENT_TX_RATE) {
enum CURRENT_TXRATE curr_tx_rate = strHostIFCfgParamAttr->cfg_attr_info.curr_tx_rate; enum CURRENT_TXRATE curr_tx_rate = cfg_param_attr->cfg_attr_info.curr_tx_rate;
if (curr_tx_rate == AUTORATE || curr_tx_rate == MBPS_1 if (curr_tx_rate == AUTORATE || curr_tx_rate == MBPS_1
|| curr_tx_rate == MBPS_2 || curr_tx_rate == MBPS_5_5 || curr_tx_rate == MBPS_2 || curr_tx_rate == MBPS_5_5
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7