Skip to content

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

staging: wilc1000: rename the member variable, enuWIDtype of wid 

This patch renames enuWIDtype of struct wid to type.
Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarTony Cho <tony.cho@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 20212c03
Show whitespace changes
Inline Side-by-side
Showing with 93 additions and 93 deletions
drivers/staging/wilc1000/coreconfigurator.h
View file @ 416d8321
...@@ -72,7 +72,7 @@ typedef enum { ...@@ -72,7 +72,7 @@ typedef enum {
struct wid { struct wid {
u16 u16WIDid; u16 u16WIDid;
enum WID_TYPE enuWIDtype; enum WID_TYPE type;
s32 s32ValueSize; s32 s32ValueSize;
s8 *ps8WidVal; s8 *ps8WidVal;
}; };
......
drivers/staging/wilc1000/host_interface.c
View file @ 416d8321
...@@ -577,7 +577,7 @@ static s32 Handle_SetChannel(struct host_if_drv *drvHandler, ...@@ -577,7 +577,7 @@ static s32 Handle_SetChannel(struct host_if_drv *drvHandler,
/*prepare configuration packet*/ /*prepare configuration packet*/
strWID.u16WIDid = (u16)WID_CURRENT_CHANNEL; strWID.u16WIDid = (u16)WID_CURRENT_CHANNEL;
strWID.enuWIDtype = WID_CHAR; strWID.type = WID_CHAR;
strWID.ps8WidVal = (char *)&(pstrHostIFSetChan->u8SetChan); strWID.ps8WidVal = (char *)&(pstrHostIFSetChan->u8SetChan);
strWID.s32ValueSize = sizeof(char); strWID.s32ValueSize = sizeof(char);
...@@ -613,7 +613,7 @@ static s32 Handle_SetWfiDrvHandler(struct host_if_drv *drvHandler, ...@@ -613,7 +613,7 @@ static s32 Handle_SetWfiDrvHandler(struct host_if_drv *drvHandler,
/*prepare configuration packet*/ /*prepare configuration packet*/
strWID.u16WIDid = (u16)WID_SET_DRV_HANDLER; strWID.u16WIDid = (u16)WID_SET_DRV_HANDLER;
strWID.enuWIDtype = WID_INT; strWID.type = WID_INT;
strWID.ps8WidVal = (s8 *)&(pstrHostIfSetDrvHandler->u32Address); strWID.ps8WidVal = (s8 *)&(pstrHostIfSetDrvHandler->u32Address);
strWID.s32ValueSize = sizeof(u32); strWID.s32ValueSize = sizeof(u32);
...@@ -654,7 +654,7 @@ static s32 Handle_SetOperationMode(struct host_if_drv *drvHandler, ...@@ -654,7 +654,7 @@ static s32 Handle_SetOperationMode(struct host_if_drv *drvHandler,
/*prepare configuration packet*/ /*prepare configuration packet*/
strWID.u16WIDid = (u16)WID_SET_OPERATION_MODE; strWID.u16WIDid = (u16)WID_SET_OPERATION_MODE;
strWID.enuWIDtype = WID_INT; strWID.type = WID_INT;
strWID.ps8WidVal = (s8 *)&(pstrHostIfSetOperationMode->u32Mode); strWID.ps8WidVal = (s8 *)&(pstrHostIfSetOperationMode->u32Mode);
strWID.s32ValueSize = sizeof(u32); strWID.s32ValueSize = sizeof(u32);
...@@ -703,7 +703,7 @@ s32 Handle_set_IPAddress(struct host_if_drv *drvHandler, u8 *pu8IPAddr, u8 idx) ...@@ -703,7 +703,7 @@ s32 Handle_set_IPAddress(struct host_if_drv *drvHandler, u8 *pu8IPAddr, u8 idx)
/*prepare configuration packet*/ /*prepare configuration packet*/
strWID.u16WIDid = (u16)WID_IP_ADDRESS; strWID.u16WIDid = (u16)WID_IP_ADDRESS;
strWID.enuWIDtype = WID_STR; strWID.type = WID_STR;
strWID.ps8WidVal = (u8 *)pu8IPAddr; strWID.ps8WidVal = (u8 *)pu8IPAddr;
strWID.s32ValueSize = IP_ALEN; strWID.s32ValueSize = IP_ALEN;
...@@ -742,7 +742,7 @@ s32 Handle_get_IPAddress(struct host_if_drv *drvHandler, u8 *pu8IPAddr, u8 idx) ...@@ -742,7 +742,7 @@ s32 Handle_get_IPAddress(struct host_if_drv *drvHandler, u8 *pu8IPAddr, u8 idx)
/*prepare configuration packet*/ /*prepare configuration packet*/
strWID.u16WIDid = (u16)WID_IP_ADDRESS; strWID.u16WIDid = (u16)WID_IP_ADDRESS;
strWID.enuWIDtype = WID_STR; strWID.type = WID_STR;
strWID.ps8WidVal = kmalloc(IP_ALEN, GFP_KERNEL); strWID.ps8WidVal = kmalloc(IP_ALEN, GFP_KERNEL);
strWID.s32ValueSize = IP_ALEN; strWID.s32ValueSize = IP_ALEN;
...@@ -798,7 +798,7 @@ static s32 Handle_SetMacAddress(struct host_if_drv *drvHandler, ...@@ -798,7 +798,7 @@ static s32 Handle_SetMacAddress(struct host_if_drv *drvHandler,
/*prepare configuration packet*/ /*prepare configuration packet*/
strWID.u16WIDid = (u16)WID_MAC_ADDR; strWID.u16WIDid = (u16)WID_MAC_ADDR;
strWID.enuWIDtype = WID_STR; strWID.type = WID_STR;
strWID.ps8WidVal = mac_buf; strWID.ps8WidVal = mac_buf;
strWID.s32ValueSize = ETH_ALEN; strWID.s32ValueSize = ETH_ALEN;
PRINT_D(GENERIC_DBG, "mac addr = :%pM\n", strWID.ps8WidVal); PRINT_D(GENERIC_DBG, "mac addr = :%pM\n", strWID.ps8WidVal);
...@@ -833,7 +833,7 @@ static s32 Handle_GetMacAddress(struct host_if_drv *drvHandler, ...@@ -833,7 +833,7 @@ static s32 Handle_GetMacAddress(struct host_if_drv *drvHandler,
/*prepare configuration packet*/ /*prepare configuration packet*/
strWID.u16WIDid = (u16)WID_MAC_ADDR; strWID.u16WIDid = (u16)WID_MAC_ADDR;
strWID.enuWIDtype = WID_STR; strWID.type = WID_STR;
strWID.ps8WidVal = pstrHostIfGetMacAddress->u8MacAddress; strWID.ps8WidVal = pstrHostIfGetMacAddress->u8MacAddress;
strWID.s32ValueSize = ETH_ALEN; strWID.s32ValueSize = ETH_ALEN;
...@@ -883,7 +883,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, ...@@ -883,7 +883,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.bss_type < 6) { if (strHostIFCfgParamAttr->pstrCfgParamVal.bss_type < 6) {
strWIDList[u8WidCnt].u16WIDid = WID_BSS_TYPE; strWIDList[u8WidCnt].u16WIDid = WID_BSS_TYPE;
strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.bss_type; strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.bss_type;
strWIDList[u8WidCnt].enuWIDtype = WID_CHAR; strWIDList[u8WidCnt].type = WID_CHAR;
strWIDList[u8WidCnt].s32ValueSize = sizeof(char); strWIDList[u8WidCnt].s32ValueSize = sizeof(char);
pstrWFIDrv->strCfgValues.bss_type = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.bss_type; pstrWFIDrv->strCfgValues.bss_type = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.bss_type;
} else { } else {
...@@ -903,7 +903,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, ...@@ -903,7 +903,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if ((strHostIFCfgParamAttr->pstrCfgParamVal.auth_type) == 1 || (strHostIFCfgParamAttr->pstrCfgParamVal.auth_type) == 2 || (strHostIFCfgParamAttr->pstrCfgParamVal.auth_type) == 5) { if ((strHostIFCfgParamAttr->pstrCfgParamVal.auth_type) == 1 || (strHostIFCfgParamAttr->pstrCfgParamVal.auth_type) == 2 || (strHostIFCfgParamAttr->pstrCfgParamVal.auth_type) == 5) {
strWIDList[u8WidCnt].u16WIDid = WID_AUTH_TYPE; strWIDList[u8WidCnt].u16WIDid = WID_AUTH_TYPE;
strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.auth_type; strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.auth_type;
strWIDList[u8WidCnt].enuWIDtype = WID_CHAR; strWIDList[u8WidCnt].type = WID_CHAR;
strWIDList[u8WidCnt].s32ValueSize = sizeof(char); strWIDList[u8WidCnt].s32ValueSize = sizeof(char);
pstrWFIDrv->strCfgValues.auth_type = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.auth_type; pstrWFIDrv->strCfgValues.auth_type = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.auth_type;
} else { } else {
...@@ -918,7 +918,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, ...@@ -918,7 +918,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.auth_timeout > 0 && strHostIFCfgParamAttr->pstrCfgParamVal.auth_timeout < 65536) { if (strHostIFCfgParamAttr->pstrCfgParamVal.auth_timeout > 0 && strHostIFCfgParamAttr->pstrCfgParamVal.auth_timeout < 65536) {
strWIDList[u8WidCnt].u16WIDid = WID_AUTH_TIMEOUT; strWIDList[u8WidCnt].u16WIDid = WID_AUTH_TIMEOUT;
strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.auth_timeout; strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.auth_timeout;
strWIDList[u8WidCnt].enuWIDtype = WID_SHORT; strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].s32ValueSize = sizeof(u16); strWIDList[u8WidCnt].s32ValueSize = sizeof(u16);
pstrWFIDrv->strCfgValues.auth_timeout = strHostIFCfgParamAttr->pstrCfgParamVal.auth_timeout; pstrWFIDrv->strCfgValues.auth_timeout = strHostIFCfgParamAttr->pstrCfgParamVal.auth_timeout;
} else { } else {
...@@ -939,7 +939,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, ...@@ -939,7 +939,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.power_mgmt_mode < 5) { if (strHostIFCfgParamAttr->pstrCfgParamVal.power_mgmt_mode < 5) {
strWIDList[u8WidCnt].u16WIDid = WID_POWER_MANAGEMENT; strWIDList[u8WidCnt].u16WIDid = WID_POWER_MANAGEMENT;
strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.power_mgmt_mode; strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.power_mgmt_mode;
strWIDList[u8WidCnt].enuWIDtype = WID_CHAR; strWIDList[u8WidCnt].type = WID_CHAR;
strWIDList[u8WidCnt].s32ValueSize = sizeof(char); strWIDList[u8WidCnt].s32ValueSize = sizeof(char);
pstrWFIDrv->strCfgValues.power_mgmt_mode = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.power_mgmt_mode; pstrWFIDrv->strCfgValues.power_mgmt_mode = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.power_mgmt_mode;
} else { } else {
...@@ -954,7 +954,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, ...@@ -954,7 +954,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if ((strHostIFCfgParamAttr->pstrCfgParamVal.short_retry_limit > 0) && (strHostIFCfgParamAttr->pstrCfgParamVal.short_retry_limit < 256)) { if ((strHostIFCfgParamAttr->pstrCfgParamVal.short_retry_limit > 0) && (strHostIFCfgParamAttr->pstrCfgParamVal.short_retry_limit < 256)) {
strWIDList[u8WidCnt].u16WIDid = WID_SHORT_RETRY_LIMIT; strWIDList[u8WidCnt].u16WIDid = WID_SHORT_RETRY_LIMIT;
strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.short_retry_limit; strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.short_retry_limit;
strWIDList[u8WidCnt].enuWIDtype = WID_SHORT; strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].s32ValueSize = sizeof(u16); strWIDList[u8WidCnt].s32ValueSize = sizeof(u16);
pstrWFIDrv->strCfgValues.short_retry_limit = strHostIFCfgParamAttr->pstrCfgParamVal.short_retry_limit; pstrWFIDrv->strCfgValues.short_retry_limit = strHostIFCfgParamAttr->pstrCfgParamVal.short_retry_limit;
} else { } else {
...@@ -970,7 +970,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, ...@@ -970,7 +970,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
strWIDList[u8WidCnt].u16WIDid = WID_LONG_RETRY_LIMIT; strWIDList[u8WidCnt].u16WIDid = WID_LONG_RETRY_LIMIT;
strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.long_retry_limit; strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.long_retry_limit;
strWIDList[u8WidCnt].enuWIDtype = WID_SHORT; strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].s32ValueSize = sizeof(u16); strWIDList[u8WidCnt].s32ValueSize = sizeof(u16);
pstrWFIDrv->strCfgValues.long_retry_limit = strHostIFCfgParamAttr->pstrCfgParamVal.long_retry_limit; pstrWFIDrv->strCfgValues.long_retry_limit = strHostIFCfgParamAttr->pstrCfgParamVal.long_retry_limit;
} else { } else {
...@@ -985,7 +985,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, ...@@ -985,7 +985,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.frag_threshold > 255 && strHostIFCfgParamAttr->pstrCfgParamVal.frag_threshold < 7937) { if (strHostIFCfgParamAttr->pstrCfgParamVal.frag_threshold > 255 && strHostIFCfgParamAttr->pstrCfgParamVal.frag_threshold < 7937) {
strWIDList[u8WidCnt].u16WIDid = WID_FRAG_THRESHOLD; strWIDList[u8WidCnt].u16WIDid = WID_FRAG_THRESHOLD;
strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.frag_threshold; strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.frag_threshold;
strWIDList[u8WidCnt].enuWIDtype = WID_SHORT; strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].s32ValueSize = sizeof(u16); strWIDList[u8WidCnt].s32ValueSize = sizeof(u16);
pstrWFIDrv->strCfgValues.frag_threshold = strHostIFCfgParamAttr->pstrCfgParamVal.frag_threshold; pstrWFIDrv->strCfgValues.frag_threshold = strHostIFCfgParamAttr->pstrCfgParamVal.frag_threshold;
} else { } else {
...@@ -1000,7 +1000,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, ...@@ -1000,7 +1000,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.rts_threshold > 255 && strHostIFCfgParamAttr->pstrCfgParamVal.rts_threshold < 65536) { if (strHostIFCfgParamAttr->pstrCfgParamVal.rts_threshold > 255 && strHostIFCfgParamAttr->pstrCfgParamVal.rts_threshold < 65536) {
strWIDList[u8WidCnt].u16WIDid = WID_RTS_THRESHOLD; strWIDList[u8WidCnt].u16WIDid = WID_RTS_THRESHOLD;
strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.rts_threshold; strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.rts_threshold;
strWIDList[u8WidCnt].enuWIDtype = WID_SHORT; strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].s32ValueSize = sizeof(u16); strWIDList[u8WidCnt].s32ValueSize = sizeof(u16);
pstrWFIDrv->strCfgValues.rts_threshold = strHostIFCfgParamAttr->pstrCfgParamVal.rts_threshold; pstrWFIDrv->strCfgValues.rts_threshold = strHostIFCfgParamAttr->pstrCfgParamVal.rts_threshold;
} else { } else {
...@@ -1019,7 +1019,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, ...@@ -1019,7 +1019,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.preamble_type < 3) { if (strHostIFCfgParamAttr->pstrCfgParamVal.preamble_type < 3) {
strWIDList[u8WidCnt].u16WIDid = WID_PREAMBLE; strWIDList[u8WidCnt].u16WIDid = WID_PREAMBLE;
strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.preamble_type; strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.preamble_type;
strWIDList[u8WidCnt].enuWIDtype = WID_CHAR; strWIDList[u8WidCnt].type = WID_CHAR;
strWIDList[u8WidCnt].s32ValueSize = sizeof(char); strWIDList[u8WidCnt].s32ValueSize = sizeof(char);
pstrWFIDrv->strCfgValues.preamble_type = strHostIFCfgParamAttr->pstrCfgParamVal.preamble_type; pstrWFIDrv->strCfgValues.preamble_type = strHostIFCfgParamAttr->pstrCfgParamVal.preamble_type;
} else { } else {
...@@ -1033,7 +1033,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, ...@@ -1033,7 +1033,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.short_slot_allowed < 2) { if (strHostIFCfgParamAttr->pstrCfgParamVal.short_slot_allowed < 2) {
strWIDList[u8WidCnt].u16WIDid = WID_SHORT_SLOT_ALLOWED; strWIDList[u8WidCnt].u16WIDid = WID_SHORT_SLOT_ALLOWED;
strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.short_slot_allowed; strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.short_slot_allowed;
strWIDList[u8WidCnt].enuWIDtype = WID_CHAR; strWIDList[u8WidCnt].type = WID_CHAR;
strWIDList[u8WidCnt].s32ValueSize = sizeof(char); strWIDList[u8WidCnt].s32ValueSize = sizeof(char);
pstrWFIDrv->strCfgValues.short_slot_allowed = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.short_slot_allowed; pstrWFIDrv->strCfgValues.short_slot_allowed = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.short_slot_allowed;
} else { } else {
...@@ -1051,7 +1051,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, ...@@ -1051,7 +1051,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.txop_prot_disabled < 2) { if (strHostIFCfgParamAttr->pstrCfgParamVal.txop_prot_disabled < 2) {
strWIDList[u8WidCnt].u16WIDid = WID_11N_TXOP_PROT_DISABLE; strWIDList[u8WidCnt].u16WIDid = WID_11N_TXOP_PROT_DISABLE;
strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.txop_prot_disabled; strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.txop_prot_disabled;
strWIDList[u8WidCnt].enuWIDtype = WID_CHAR; strWIDList[u8WidCnt].type = WID_CHAR;
strWIDList[u8WidCnt].s32ValueSize = sizeof(char); strWIDList[u8WidCnt].s32ValueSize = sizeof(char);
pstrWFIDrv->strCfgValues.txop_prot_disabled = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.txop_prot_disabled; pstrWFIDrv->strCfgValues.txop_prot_disabled = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.txop_prot_disabled;
} else { } else {
...@@ -1066,7 +1066,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, ...@@ -1066,7 +1066,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.beacon_interval > 0 && strHostIFCfgParamAttr->pstrCfgParamVal.beacon_interval < 65536) { if (strHostIFCfgParamAttr->pstrCfgParamVal.beacon_interval > 0 && strHostIFCfgParamAttr->pstrCfgParamVal.beacon_interval < 65536) {
strWIDList[u8WidCnt].u16WIDid = WID_BEACON_INTERVAL; strWIDList[u8WidCnt].u16WIDid = WID_BEACON_INTERVAL;
strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.beacon_interval; strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.beacon_interval;
strWIDList[u8WidCnt].enuWIDtype = WID_SHORT; strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].s32ValueSize = sizeof(u16); strWIDList[u8WidCnt].s32ValueSize = sizeof(u16);
pstrWFIDrv->strCfgValues.beacon_interval = strHostIFCfgParamAttr->pstrCfgParamVal.beacon_interval; pstrWFIDrv->strCfgValues.beacon_interval = strHostIFCfgParamAttr->pstrCfgParamVal.beacon_interval;
} else { } else {
...@@ -1081,7 +1081,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, ...@@ -1081,7 +1081,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.dtim_period > 0 && strHostIFCfgParamAttr->pstrCfgParamVal.dtim_period < 256) { if (strHostIFCfgParamAttr->pstrCfgParamVal.dtim_period > 0 && strHostIFCfgParamAttr->pstrCfgParamVal.dtim_period < 256) {
strWIDList[u8WidCnt].u16WIDid = WID_DTIM_PERIOD; strWIDList[u8WidCnt].u16WIDid = WID_DTIM_PERIOD;
strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.dtim_period; strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.dtim_period;
strWIDList[u8WidCnt].enuWIDtype = WID_CHAR; strWIDList[u8WidCnt].type = WID_CHAR;
strWIDList[u8WidCnt].s32ValueSize = sizeof(char); strWIDList[u8WidCnt].s32ValueSize = sizeof(char);
pstrWFIDrv->strCfgValues.dtim_period = strHostIFCfgParamAttr->pstrCfgParamVal.dtim_period; pstrWFIDrv->strCfgValues.dtim_period = strHostIFCfgParamAttr->pstrCfgParamVal.dtim_period;
} else { } else {
...@@ -1100,7 +1100,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, ...@@ -1100,7 +1100,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.site_survey_enabled < 3) { if (strHostIFCfgParamAttr->pstrCfgParamVal.site_survey_enabled < 3) {
strWIDList[u8WidCnt].u16WIDid = WID_SITE_SURVEY; strWIDList[u8WidCnt].u16WIDid = WID_SITE_SURVEY;
strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.site_survey_enabled; strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.site_survey_enabled;
strWIDList[u8WidCnt].enuWIDtype = WID_CHAR; strWIDList[u8WidCnt].type = WID_CHAR;
strWIDList[u8WidCnt].s32ValueSize = sizeof(char); strWIDList[u8WidCnt].s32ValueSize = sizeof(char);
pstrWFIDrv->strCfgValues.site_survey_enabled = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.site_survey_enabled; pstrWFIDrv->strCfgValues.site_survey_enabled = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.site_survey_enabled;
} else { } else {
...@@ -1115,7 +1115,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, ...@@ -1115,7 +1115,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.site_survey_scan_time > 0 && strHostIFCfgParamAttr->pstrCfgParamVal.site_survey_scan_time < 65536) { if (strHostIFCfgParamAttr->pstrCfgParamVal.site_survey_scan_time > 0 && strHostIFCfgParamAttr->pstrCfgParamVal.site_survey_scan_time < 65536) {
strWIDList[u8WidCnt].u16WIDid = WID_SITE_SURVEY_SCAN_TIME; strWIDList[u8WidCnt].u16WIDid = WID_SITE_SURVEY_SCAN_TIME;
strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.site_survey_scan_time; strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.site_survey_scan_time;
strWIDList[u8WidCnt].enuWIDtype = WID_SHORT; strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].s32ValueSize = sizeof(u16); strWIDList[u8WidCnt].s32ValueSize = sizeof(u16);
pstrWFIDrv->strCfgValues.site_survey_scan_time = strHostIFCfgParamAttr->pstrCfgParamVal.site_survey_scan_time; pstrWFIDrv->strCfgValues.site_survey_scan_time = strHostIFCfgParamAttr->pstrCfgParamVal.site_survey_scan_time;
} else { } else {
...@@ -1130,7 +1130,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, ...@@ -1130,7 +1130,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.active_scan_time > 0 && strHostIFCfgParamAttr->pstrCfgParamVal.active_scan_time < 65536) { if (strHostIFCfgParamAttr->pstrCfgParamVal.active_scan_time > 0 && strHostIFCfgParamAttr->pstrCfgParamVal.active_scan_time < 65536) {
strWIDList[u8WidCnt].u16WIDid = WID_ACTIVE_SCAN_TIME; strWIDList[u8WidCnt].u16WIDid = WID_ACTIVE_SCAN_TIME;
strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.active_scan_time; strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.active_scan_time;
strWIDList[u8WidCnt].enuWIDtype = WID_SHORT; strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].s32ValueSize = sizeof(u16); strWIDList[u8WidCnt].s32ValueSize = sizeof(u16);
pstrWFIDrv->strCfgValues.active_scan_time = strHostIFCfgParamAttr->pstrCfgParamVal.active_scan_time; pstrWFIDrv->strCfgValues.active_scan_time = strHostIFCfgParamAttr->pstrCfgParamVal.active_scan_time;
} else { } else {
...@@ -1145,7 +1145,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, ...@@ -1145,7 +1145,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.passive_scan_time > 0 && strHostIFCfgParamAttr->pstrCfgParamVal.passive_scan_time < 65536) { if (strHostIFCfgParamAttr->pstrCfgParamVal.passive_scan_time > 0 && strHostIFCfgParamAttr->pstrCfgParamVal.passive_scan_time < 65536) {
strWIDList[u8WidCnt].u16WIDid = WID_PASSIVE_SCAN_TIME; strWIDList[u8WidCnt].u16WIDid = WID_PASSIVE_SCAN_TIME;
strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.passive_scan_time; strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.passive_scan_time;
strWIDList[u8WidCnt].enuWIDtype = WID_SHORT; strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].s32ValueSize = sizeof(u16); strWIDList[u8WidCnt].s32ValueSize = sizeof(u16);
pstrWFIDrv->strCfgValues.passive_scan_time = strHostIFCfgParamAttr->pstrCfgParamVal.passive_scan_time; pstrWFIDrv->strCfgValues.passive_scan_time = strHostIFCfgParamAttr->pstrCfgParamVal.passive_scan_time;
} else { } else {
...@@ -1170,7 +1170,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, ...@@ -1170,7 +1170,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
|| curr_tx_rate == MBPS_36 || curr_tx_rate == MBPS_48 || curr_tx_rate == MBPS_54) { || curr_tx_rate == MBPS_36 || curr_tx_rate == MBPS_48 || curr_tx_rate == MBPS_54) {
strWIDList[u8WidCnt].u16WIDid = WID_CURRENT_TX_RATE; strWIDList[u8WidCnt].u16WIDid = WID_CURRENT_TX_RATE;
strWIDList[u8WidCnt].ps8WidVal = (s8 *)&curr_tx_rate; strWIDList[u8WidCnt].ps8WidVal = (s8 *)&curr_tx_rate;
strWIDList[u8WidCnt].enuWIDtype = WID_SHORT; strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].s32ValueSize = sizeof(u16); strWIDList[u8WidCnt].s32ValueSize = sizeof(u16);
pstrWFIDrv->strCfgValues.curr_tx_rate = (u8)curr_tx_rate; pstrWFIDrv->strCfgValues.curr_tx_rate = (u8)curr_tx_rate;
} else { } else {
...@@ -1256,7 +1256,7 @@ static s32 Handle_Scan(struct host_if_drv *drvHandler, ...@@ -1256,7 +1256,7 @@ static s32 Handle_Scan(struct host_if_drv *drvHandler,
pstrWFIDrv->strWILC_UsrScanReq.u32RcvdChCount = 0; pstrWFIDrv->strWILC_UsrScanReq.u32RcvdChCount = 0;
strWIDList[u32WidsCount].u16WIDid = (u16)WID_SSID_PROBE_REQ; strWIDList[u32WidsCount].u16WIDid = (u16)WID_SSID_PROBE_REQ;
strWIDList[u32WidsCount].enuWIDtype = WID_STR; strWIDList[u32WidsCount].type = WID_STR;
for (i = 0; i < pstrHostIFscanAttr->strHiddenNetwork.u8ssidnum; i++) for (i = 0; i < pstrHostIFscanAttr->strHiddenNetwork.u8ssidnum; i++)
valuesize += ((pstrHostIFscanAttr->strHiddenNetwork.pstrHiddenNetworkInfo[i].u8ssidlen) + 1); valuesize += ((pstrHostIFscanAttr->strHiddenNetwork.pstrHiddenNetworkInfo[i].u8ssidlen) + 1);
...@@ -1287,7 +1287,7 @@ static s32 Handle_Scan(struct host_if_drv *drvHandler, ...@@ -1287,7 +1287,7 @@ static s32 Handle_Scan(struct host_if_drv *drvHandler,
{ {
/* IEs to be inserted in Probe Request */ /* IEs to be inserted in Probe Request */
strWIDList[u32WidsCount].u16WIDid = WID_INFO_ELEMENT_PROBE; strWIDList[u32WidsCount].u16WIDid = WID_INFO_ELEMENT_PROBE;
strWIDList[u32WidsCount].enuWIDtype = WID_BIN_DATA; strWIDList[u32WidsCount].type = WID_BIN_DATA;
strWIDList[u32WidsCount].ps8WidVal = pstrHostIFscanAttr->pu8IEs; strWIDList[u32WidsCount].ps8WidVal = pstrHostIFscanAttr->pu8IEs;
strWIDList[u32WidsCount].s32ValueSize = pstrHostIFscanAttr->IEsLen; strWIDList[u32WidsCount].s32ValueSize = pstrHostIFscanAttr->IEsLen;
u32WidsCount++; u32WidsCount++;
...@@ -1295,14 +1295,14 @@ static s32 Handle_Scan(struct host_if_drv *drvHandler, ...@@ -1295,14 +1295,14 @@ static s32 Handle_Scan(struct host_if_drv *drvHandler,
/*Scan Type*/ /*Scan Type*/
strWIDList[u32WidsCount].u16WIDid = WID_SCAN_TYPE; strWIDList[u32WidsCount].u16WIDid = WID_SCAN_TYPE;
strWIDList[u32WidsCount].enuWIDtype = WID_CHAR; strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].s32ValueSize = sizeof(char); strWIDList[u32WidsCount].s32ValueSize = sizeof(char);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrHostIFscanAttr->u8ScanType)); strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrHostIFscanAttr->u8ScanType));
u32WidsCount++; u32WidsCount++;
/*list of channels to be scanned*/ /*list of channels to be scanned*/
strWIDList[u32WidsCount].u16WIDid = WID_SCAN_CHANNEL_LIST; strWIDList[u32WidsCount].u16WIDid = WID_SCAN_CHANNEL_LIST;
strWIDList[u32WidsCount].enuWIDtype = WID_BIN_DATA; strWIDList[u32WidsCount].type = WID_BIN_DATA;
if (pstrHostIFscanAttr->pu8ChnlFreqList != NULL && pstrHostIFscanAttr->u8ChnlListLen > 0) { if (pstrHostIFscanAttr->pu8ChnlFreqList != NULL && pstrHostIFscanAttr->u8ChnlListLen > 0) {
int i; int i;
...@@ -1319,7 +1319,7 @@ static s32 Handle_Scan(struct host_if_drv *drvHandler, ...@@ -1319,7 +1319,7 @@ static s32 Handle_Scan(struct host_if_drv *drvHandler,
/*Scan Request*/ /*Scan Request*/
strWIDList[u32WidsCount].u16WIDid = WID_START_SCAN_REQ; strWIDList[u32WidsCount].u16WIDid = WID_START_SCAN_REQ;
strWIDList[u32WidsCount].enuWIDtype = WID_CHAR; strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].s32ValueSize = sizeof(char); strWIDList[u32WidsCount].s32ValueSize = sizeof(char);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrHostIFscanAttr->u8ScanSource)); strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrHostIFscanAttr->u8ScanSource));
u32WidsCount++; u32WidsCount++;
...@@ -1402,7 +1402,7 @@ static s32 Handle_ScanDone(struct host_if_drv *drvHandler, tenuScanEvent enuEven ...@@ -1402,7 +1402,7 @@ static s32 Handle_ScanDone(struct host_if_drv *drvHandler, tenuScanEvent enuEven
PRINT_D(GENERIC_DBG, "Abort running scan\n"); PRINT_D(GENERIC_DBG, "Abort running scan\n");
u8abort_running_scan = 1; u8abort_running_scan = 1;
strWID.u16WIDid = (u16)WID_ABORT_RUNNING_SCAN; strWID.u16WIDid = (u16)WID_ABORT_RUNNING_SCAN;
strWID.enuWIDtype = WID_CHAR; strWID.type = WID_CHAR;
strWID.ps8WidVal = (s8 *)&u8abort_running_scan; strWID.ps8WidVal = (s8 *)&u8abort_running_scan;
strWID.s32ValueSize = sizeof(char); strWID.s32ValueSize = sizeof(char);
...@@ -1498,19 +1498,19 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler, ...@@ -1498,19 +1498,19 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler,
pstrWFIDrv->strWILC_UsrConnReq.u32UserConnectPvoid = pstrHostIFconnectAttr->pvUserArg; pstrWFIDrv->strWILC_UsrConnReq.u32UserConnectPvoid = pstrHostIFconnectAttr->pvUserArg;
strWIDList[u32WidsCount].u16WIDid = WID_SUCCESS_FRAME_COUNT; strWIDList[u32WidsCount].u16WIDid = WID_SUCCESS_FRAME_COUNT;
strWIDList[u32WidsCount].enuWIDtype = WID_INT; strWIDList[u32WidsCount].type = WID_INT;
strWIDList[u32WidsCount].s32ValueSize = sizeof(u32); strWIDList[u32WidsCount].s32ValueSize = sizeof(u32);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(dummyval)); strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(dummyval));
u32WidsCount++; u32WidsCount++;
strWIDList[u32WidsCount].u16WIDid = WID_RECEIVED_FRAGMENT_COUNT; strWIDList[u32WidsCount].u16WIDid = WID_RECEIVED_FRAGMENT_COUNT;
strWIDList[u32WidsCount].enuWIDtype = WID_INT; strWIDList[u32WidsCount].type = WID_INT;
strWIDList[u32WidsCount].s32ValueSize = sizeof(u32); strWIDList[u32WidsCount].s32ValueSize = sizeof(u32);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(dummyval)); strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(dummyval));
u32WidsCount++; u32WidsCount++;
strWIDList[u32WidsCount].u16WIDid = WID_FAILED_COUNT; strWIDList[u32WidsCount].u16WIDid = WID_FAILED_COUNT;
strWIDList[u32WidsCount].enuWIDtype = WID_INT; strWIDList[u32WidsCount].type = WID_INT;
strWIDList[u32WidsCount].s32ValueSize = sizeof(u32); strWIDList[u32WidsCount].s32ValueSize = sizeof(u32);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(dummyval)); strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(dummyval));
u32WidsCount++; u32WidsCount++;
...@@ -1520,7 +1520,7 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler, ...@@ -1520,7 +1520,7 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler,
{ {
/* IEs to be inserted in Association Request */ /* IEs to be inserted in Association Request */
strWIDList[u32WidsCount].u16WIDid = WID_INFO_ELEMENT_ASSOCIATE; strWIDList[u32WidsCount].u16WIDid = WID_INFO_ELEMENT_ASSOCIATE;
strWIDList[u32WidsCount].enuWIDtype = WID_BIN_DATA; strWIDList[u32WidsCount].type = WID_BIN_DATA;
strWIDList[u32WidsCount].ps8WidVal = pstrWFIDrv->strWILC_UsrConnReq.pu8ConnReqIEs; strWIDList[u32WidsCount].ps8WidVal = pstrWFIDrv->strWILC_UsrConnReq.pu8ConnReqIEs;
strWIDList[u32WidsCount].s32ValueSize = pstrWFIDrv->strWILC_UsrConnReq.ConnReqIEsLen; strWIDList[u32WidsCount].s32ValueSize = pstrWFIDrv->strWILC_UsrConnReq.ConnReqIEsLen;
u32WidsCount++; u32WidsCount++;
...@@ -1534,7 +1534,7 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler, ...@@ -1534,7 +1534,7 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler,
} }
} }
strWIDList[u32WidsCount].u16WIDid = (u16)WID_11I_MODE; strWIDList[u32WidsCount].u16WIDid = (u16)WID_11I_MODE;
strWIDList[u32WidsCount].enuWIDtype = WID_CHAR; strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].s32ValueSize = sizeof(char); strWIDList[u32WidsCount].s32ValueSize = sizeof(char);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrWFIDrv->strWILC_UsrConnReq.u8security)); strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrWFIDrv->strWILC_UsrConnReq.u8security));
u32WidsCount++; u32WidsCount++;
...@@ -1546,7 +1546,7 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler, ...@@ -1546,7 +1546,7 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler,
strWIDList[u32WidsCount].u16WIDid = (u16)WID_AUTH_TYPE; strWIDList[u32WidsCount].u16WIDid = (u16)WID_AUTH_TYPE;
strWIDList[u32WidsCount].enuWIDtype = WID_CHAR; strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].s32ValueSize = sizeof(char); strWIDList[u32WidsCount].s32ValueSize = sizeof(char);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&pstrWFIDrv->strWILC_UsrConnReq.tenuAuth_type); strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&pstrWFIDrv->strWILC_UsrConnReq.tenuAuth_type);
u32WidsCount++; u32WidsCount++;
...@@ -1567,7 +1567,7 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler, ...@@ -1567,7 +1567,7 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler,
pstrWFIDrv->strWILC_UsrConnReq.pu8ssid, pstrHostIFconnectAttr->u8channel); pstrWFIDrv->strWILC_UsrConnReq.pu8ssid, pstrHostIFconnectAttr->u8channel);
strWIDList[u32WidsCount].u16WIDid = (u16)WID_JOIN_REQ_EXTENDED; strWIDList[u32WidsCount].u16WIDid = (u16)WID_JOIN_REQ_EXTENDED;
strWIDList[u32WidsCount].enuWIDtype = WID_STR; strWIDList[u32WidsCount].type = WID_STR;
/*Sending NoA attributes during connection*/ /*Sending NoA attributes during connection*/
strWIDList[u32WidsCount].s32ValueSize = 112; /* 79; */ strWIDList[u32WidsCount].s32ValueSize = 112; /* 79; */
...@@ -1814,13 +1814,13 @@ static s32 Handle_FlushConnect(struct host_if_drv *drvHandler) ...@@ -1814,13 +1814,13 @@ static s32 Handle_FlushConnect(struct host_if_drv *drvHandler)
/* IEs to be inserted in Association Request */ /* IEs to be inserted in Association Request */
strWIDList[u32WidsCount].u16WIDid = WID_INFO_ELEMENT_ASSOCIATE; strWIDList[u32WidsCount].u16WIDid = WID_INFO_ELEMENT_ASSOCIATE;
strWIDList[u32WidsCount].enuWIDtype = WID_BIN_DATA; strWIDList[u32WidsCount].type = WID_BIN_DATA;
strWIDList[u32WidsCount].ps8WidVal = gu8FlushedInfoElemAsoc; strWIDList[u32WidsCount].ps8WidVal = gu8FlushedInfoElemAsoc;
strWIDList[u32WidsCount].s32ValueSize = gu32FlushedInfoElemAsocSize; strWIDList[u32WidsCount].s32ValueSize = gu32FlushedInfoElemAsocSize;
u32WidsCount++; u32WidsCount++;
strWIDList[u32WidsCount].u16WIDid = (u16)WID_11I_MODE; strWIDList[u32WidsCount].u16WIDid = (u16)WID_11I_MODE;
strWIDList[u32WidsCount].enuWIDtype = WID_CHAR; strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].s32ValueSize = sizeof(char); strWIDList[u32WidsCount].s32ValueSize = sizeof(char);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(gu8Flushed11iMode)); strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(gu8Flushed11iMode));
u32WidsCount++; u32WidsCount++;
...@@ -1828,13 +1828,13 @@ static s32 Handle_FlushConnect(struct host_if_drv *drvHandler) ...@@ -1828,13 +1828,13 @@ static s32 Handle_FlushConnect(struct host_if_drv *drvHandler)
strWIDList[u32WidsCount].u16WIDid = (u16)WID_AUTH_TYPE; strWIDList[u32WidsCount].u16WIDid = (u16)WID_AUTH_TYPE;
strWIDList[u32WidsCount].enuWIDtype = WID_CHAR; strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].s32ValueSize = sizeof(char); strWIDList[u32WidsCount].s32ValueSize = sizeof(char);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&gu8FlushedAuthType); strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&gu8FlushedAuthType);
u32WidsCount++; u32WidsCount++;
strWIDList[u32WidsCount].u16WIDid = (u16)WID_JOIN_REQ_EXTENDED; strWIDList[u32WidsCount].u16WIDid = (u16)WID_JOIN_REQ_EXTENDED;
strWIDList[u32WidsCount].enuWIDtype = WID_STR; strWIDList[u32WidsCount].type = WID_STR;
strWIDList[u32WidsCount].s32ValueSize = gu32FlushedJoinReqSize; strWIDList[u32WidsCount].s32ValueSize = gu32FlushedJoinReqSize;
strWIDList[u32WidsCount].ps8WidVal = (s8 *)gu8FlushedJoinReq; strWIDList[u32WidsCount].ps8WidVal = (s8 *)gu8FlushedJoinReq;
pu8CurrByte = strWIDList[u32WidsCount].ps8WidVal; pu8CurrByte = strWIDList[u32WidsCount].ps8WidVal;
...@@ -1919,7 +1919,7 @@ static s32 Handle_ConnectTimeout(struct host_if_drv *drvHandler) ...@@ -1919,7 +1919,7 @@ static s32 Handle_ConnectTimeout(struct host_if_drv *drvHandler)
/* Here we will notify our firmware also with the Connection failure {through sending to it Cfg packet carrying /* Here we will notify our firmware also with the Connection failure {through sending to it Cfg packet carrying
* WID_DISCONNECT} */ * WID_DISCONNECT} */
strWID.u16WIDid = (u16)WID_DISCONNECT; strWID.u16WIDid = (u16)WID_DISCONNECT;
strWID.enuWIDtype = WID_CHAR; strWID.type = WID_CHAR;
strWID.ps8WidVal = (s8 *)&u16DummyReasonCode; strWID.ps8WidVal = (s8 *)&u16DummyReasonCode;
strWID.s32ValueSize = sizeof(char); strWID.s32ValueSize = sizeof(char);
...@@ -2426,17 +2426,17 @@ static int Handle_Key(struct host_if_drv *drvHandler, ...@@ -2426,17 +2426,17 @@ static int Handle_Key(struct host_if_drv *drvHandler,
PRINT_D(HOSTINF_DBG, "Handling WEP key\n"); PRINT_D(HOSTINF_DBG, "Handling WEP key\n");
PRINT_D(GENERIC_DBG, "ID Hostint is %d\n", (pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx)); PRINT_D(GENERIC_DBG, "ID Hostint is %d\n", (pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx));
strWIDList[0].u16WIDid = (u16)WID_11I_MODE; strWIDList[0].u16WIDid = (u16)WID_11I_MODE;
strWIDList[0].enuWIDtype = WID_CHAR; strWIDList[0].type = WID_CHAR;
strWIDList[0].s32ValueSize = sizeof(char); strWIDList[0].s32ValueSize = sizeof(char);
strWIDList[0].ps8WidVal = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8mode)); strWIDList[0].ps8WidVal = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8mode));
strWIDList[1].u16WIDid = WID_AUTH_TYPE; strWIDList[1].u16WIDid = WID_AUTH_TYPE;
strWIDList[1].enuWIDtype = WID_CHAR; strWIDList[1].type = WID_CHAR;
strWIDList[1].s32ValueSize = sizeof(char); strWIDList[1].s32ValueSize = sizeof(char);
strWIDList[1].ps8WidVal = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.tenuAuth_type)); strWIDList[1].ps8WidVal = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.tenuAuth_type));
strWIDList[2].u16WIDid = (u16)WID_KEY_ID; strWIDList[2].u16WIDid = (u16)WID_KEY_ID;
strWIDList[2].enuWIDtype = WID_CHAR; strWIDList[2].type = WID_CHAR;
strWIDList[2].ps8WidVal = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx)); strWIDList[2].ps8WidVal = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx));
strWIDList[2].s32ValueSize = sizeof(char); strWIDList[2].s32ValueSize = sizeof(char);
...@@ -2457,7 +2457,7 @@ static int Handle_Key(struct host_if_drv *drvHandler, ...@@ -2457,7 +2457,7 @@ static int Handle_Key(struct host_if_drv *drvHandler,
kfree(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.pu8WepKey); kfree(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.pu8WepKey);
strWIDList[3].u16WIDid = (u16)WID_WEP_KEY_VALUE; strWIDList[3].u16WIDid = (u16)WID_WEP_KEY_VALUE;
strWIDList[3].enuWIDtype = WID_STR; strWIDList[3].type = WID_STR;
strWIDList[3].s32ValueSize = pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8WepKeylen; strWIDList[3].s32ValueSize = pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8WepKeylen;
strWIDList[3].ps8WidVal = (s8 *)pu8keybuf; strWIDList[3].ps8WidVal = (s8 *)pu8keybuf;
...@@ -2486,7 +2486,7 @@ static int Handle_Key(struct host_if_drv *drvHandler, ...@@ -2486,7 +2486,7 @@ static int Handle_Key(struct host_if_drv *drvHandler,
kfree(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.pu8WepKey); kfree(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.pu8WepKey);
strWID.u16WIDid = (u16)WID_ADD_WEP_KEY; strWID.u16WIDid = (u16)WID_ADD_WEP_KEY;
strWID.enuWIDtype = WID_STR; strWID.type = WID_STR;
strWID.ps8WidVal = (s8 *)pu8keybuf; strWID.ps8WidVal = (s8 *)pu8keybuf;
strWID.s32ValueSize = pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8WepKeylen + 2; strWID.s32ValueSize = pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8WepKeylen + 2;
...@@ -2497,7 +2497,7 @@ static int Handle_Key(struct host_if_drv *drvHandler, ...@@ -2497,7 +2497,7 @@ static int Handle_Key(struct host_if_drv *drvHandler,
PRINT_D(HOSTINF_DBG, "Removing key\n"); PRINT_D(HOSTINF_DBG, "Removing key\n");
strWID.u16WIDid = (u16)WID_REMOVE_WEP_KEY; strWID.u16WIDid = (u16)WID_REMOVE_WEP_KEY;
strWID.enuWIDtype = WID_STR; strWID.type = WID_STR;
s8idxarray[0] = (s8)pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx; s8idxarray[0] = (s8)pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx;
strWID.ps8WidVal = s8idxarray; strWID.ps8WidVal = s8idxarray;
...@@ -2507,7 +2507,7 @@ static int Handle_Key(struct host_if_drv *drvHandler, ...@@ -2507,7 +2507,7 @@ static int Handle_Key(struct host_if_drv *drvHandler,
get_id_from_handler(pstrWFIDrv)); get_id_from_handler(pstrWFIDrv));
} else { } else {
strWID.u16WIDid = (u16)WID_KEY_ID; strWID.u16WIDid = (u16)WID_KEY_ID;
strWID.enuWIDtype = WID_CHAR; strWID.type = WID_CHAR;
strWID.ps8WidVal = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx)); strWID.ps8WidVal = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx));
strWID.s32ValueSize = sizeof(char); strWID.s32ValueSize = sizeof(char);
...@@ -2550,12 +2550,12 @@ static int Handle_Key(struct host_if_drv *drvHandler, ...@@ -2550,12 +2550,12 @@ static int Handle_Key(struct host_if_drv *drvHandler,
pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwpaAttr.u8Keylen); pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwpaAttr.u8Keylen);
/* pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwpaAttr.u8Ciphermode = 0X51; */ /* pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwpaAttr.u8Ciphermode = 0X51; */
strWIDList[0].u16WIDid = (u16)WID_11I_MODE; strWIDList[0].u16WIDid = (u16)WID_11I_MODE;
strWIDList[0].enuWIDtype = WID_CHAR; strWIDList[0].type = WID_CHAR;
strWIDList[0].s32ValueSize = sizeof(char); strWIDList[0].s32ValueSize = sizeof(char);
strWIDList[0].ps8WidVal = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwpaAttr.u8Ciphermode)); strWIDList[0].ps8WidVal = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwpaAttr.u8Ciphermode));
strWIDList[1].u16WIDid = (u16)WID_ADD_RX_GTK; strWIDList[1].u16WIDid = (u16)WID_ADD_RX_GTK;
strWIDList[1].enuWIDtype = WID_STR; strWIDList[1].type = WID_STR;
strWIDList[1].ps8WidVal = (s8 *)pu8keybuf; strWIDList[1].ps8WidVal = (s8 *)pu8keybuf;
strWIDList[1].s32ValueSize = RX_MIC_KEY_MSG_LEN; strWIDList[1].s32ValueSize = RX_MIC_KEY_MSG_LEN;
...@@ -2601,7 +2601,7 @@ static int Handle_Key(struct host_if_drv *drvHandler, ...@@ -2601,7 +2601,7 @@ static int Handle_Key(struct host_if_drv *drvHandler,
pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwpaAttr.u8Keylen); pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwpaAttr.u8Keylen);
strWID.u16WIDid = (u16)WID_ADD_RX_GTK; strWID.u16WIDid = (u16)WID_ADD_RX_GTK;
strWID.enuWIDtype = WID_STR; strWID.type = WID_STR;
strWID.ps8WidVal = (s8 *)pu8keybuf; strWID.ps8WidVal = (s8 *)pu8keybuf;
strWID.s32ValueSize = RX_MIC_KEY_MSG_LEN; strWID.s32ValueSize = RX_MIC_KEY_MSG_LEN;
...@@ -2653,12 +2653,12 @@ static int Handle_Key(struct host_if_drv *drvHandler, ...@@ -2653,12 +2653,12 @@ static int Handle_Key(struct host_if_drv *drvHandler,
strWIDList[0].u16WIDid = (u16)WID_11I_MODE; strWIDList[0].u16WIDid = (u16)WID_11I_MODE;
strWIDList[0].enuWIDtype = WID_CHAR; strWIDList[0].type = WID_CHAR;
strWIDList[0].s32ValueSize = sizeof(char); strWIDList[0].s32ValueSize = sizeof(char);
strWIDList[0].ps8WidVal = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwpaAttr.u8Ciphermode)); strWIDList[0].ps8WidVal = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwpaAttr.u8Ciphermode));
strWIDList[1].u16WIDid = (u16)WID_ADD_PTK; strWIDList[1].u16WIDid = (u16)WID_ADD_PTK;
strWIDList[1].enuWIDtype = WID_STR; strWIDList[1].type = WID_STR;
strWIDList[1].ps8WidVal = (s8 *)pu8keybuf; strWIDList[1].ps8WidVal = (s8 *)pu8keybuf;
strWIDList[1].s32ValueSize = PTK_KEY_MSG_LEN + 1; strWIDList[1].s32ValueSize = PTK_KEY_MSG_LEN + 1;
...@@ -2699,7 +2699,7 @@ static int Handle_Key(struct host_if_drv *drvHandler, ...@@ -2699,7 +2699,7 @@ static int Handle_Key(struct host_if_drv *drvHandler,
strWID.u16WIDid = (u16)WID_ADD_PTK; strWID.u16WIDid = (u16)WID_ADD_PTK;
strWID.enuWIDtype = WID_STR; strWID.type = WID_STR;
strWID.ps8WidVal = (s8 *)pu8keybuf; strWID.ps8WidVal = (s8 *)pu8keybuf;
strWID.s32ValueSize = PTK_KEY_MSG_LEN; strWID.s32ValueSize = PTK_KEY_MSG_LEN;
...@@ -2739,7 +2739,7 @@ static int Handle_Key(struct host_if_drv *drvHandler, ...@@ -2739,7 +2739,7 @@ static int Handle_Key(struct host_if_drv *drvHandler,
} }
strWID.u16WIDid = (u16)WID_PMKID_INFO; strWID.u16WIDid = (u16)WID_PMKID_INFO;
strWID.enuWIDtype = WID_STR; strWID.type = WID_STR;
strWID.ps8WidVal = (s8 *)pu8keybuf; strWID.ps8WidVal = (s8 *)pu8keybuf;
strWID.s32ValueSize = (pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFpmkidAttr.numpmkid * PMKSA_KEY_LEN) + 1; strWID.s32ValueSize = (pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFpmkidAttr.numpmkid * PMKSA_KEY_LEN) + 1;
...@@ -2777,7 +2777,7 @@ static void Handle_Disconnect(struct host_if_drv *drvHandler) ...@@ -2777,7 +2777,7 @@ static void Handle_Disconnect(struct host_if_drv *drvHandler)
strWID.u16WIDid = (u16)WID_DISCONNECT; strWID.u16WIDid = (u16)WID_DISCONNECT;
strWID.enuWIDtype = WID_CHAR; strWID.type = WID_CHAR;
strWID.ps8WidVal = (s8 *)&u16DummyReasonCode; strWID.ps8WidVal = (s8 *)&u16DummyReasonCode;
strWID.s32ValueSize = sizeof(char); strWID.s32ValueSize = sizeof(char);
...@@ -2901,7 +2901,7 @@ static s32 Handle_GetChnl(struct host_if_drv *drvHandler) ...@@ -2901,7 +2901,7 @@ static s32 Handle_GetChnl(struct host_if_drv *drvHandler)
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
strWID.u16WIDid = (u16)WID_CURRENT_CHANNEL; strWID.u16WIDid = (u16)WID_CURRENT_CHANNEL;
strWID.enuWIDtype = WID_CHAR; strWID.type = WID_CHAR;
strWID.ps8WidVal = (s8 *)&gu8Chnl; strWID.ps8WidVal = (s8 *)&gu8Chnl;
strWID.s32ValueSize = sizeof(char); strWID.s32ValueSize = sizeof(char);
...@@ -2940,7 +2940,7 @@ static void Handle_GetRssi(struct host_if_drv *drvHandler) ...@@ -2940,7 +2940,7 @@ static void Handle_GetRssi(struct host_if_drv *drvHandler)
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
strWID.u16WIDid = (u16)WID_RSSI; strWID.u16WIDid = (u16)WID_RSSI;
strWID.enuWIDtype = WID_CHAR; strWID.type = WID_CHAR;
strWID.ps8WidVal = &gs8Rssi; strWID.ps8WidVal = &gs8Rssi;
strWID.s32ValueSize = sizeof(char); strWID.s32ValueSize = sizeof(char);
...@@ -2969,7 +2969,7 @@ static void Handle_GetLinkspeed(struct host_if_drv *drvHandler) ...@@ -2969,7 +2969,7 @@ static void Handle_GetLinkspeed(struct host_if_drv *drvHandler)
gs8lnkspd = 0; gs8lnkspd = 0;
strWID.u16WIDid = (u16)WID_LINKSPEED; strWID.u16WIDid = (u16)WID_LINKSPEED;
strWID.enuWIDtype = WID_CHAR; strWID.type = WID_CHAR;
strWID.ps8WidVal = &gs8lnkspd; strWID.ps8WidVal = &gs8lnkspd;
strWID.s32ValueSize = sizeof(char); strWID.s32ValueSize = sizeof(char);
/*Sending Cfg*/ /*Sending Cfg*/
...@@ -2993,31 +2993,31 @@ s32 Handle_GetStatistics(struct host_if_drv *drvHandler, tstrStatistics *pstrSta ...@@ -2993,31 +2993,31 @@ s32 Handle_GetStatistics(struct host_if_drv *drvHandler, tstrStatistics *pstrSta
u32 u32WidsCount = 0, s32Error = 0; u32 u32WidsCount = 0, s32Error = 0;
strWIDList[u32WidsCount].u16WIDid = WID_LINKSPEED; strWIDList[u32WidsCount].u16WIDid = WID_LINKSPEED;
strWIDList[u32WidsCount].enuWIDtype = WID_CHAR; strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].s32ValueSize = sizeof(char); strWIDList[u32WidsCount].s32ValueSize = sizeof(char);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrStatistics->u8LinkSpeed)); strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrStatistics->u8LinkSpeed));
u32WidsCount++; u32WidsCount++;
strWIDList[u32WidsCount].u16WIDid = WID_RSSI; strWIDList[u32WidsCount].u16WIDid = WID_RSSI;
strWIDList[u32WidsCount].enuWIDtype = WID_CHAR; strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].s32ValueSize = sizeof(char); strWIDList[u32WidsCount].s32ValueSize = sizeof(char);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrStatistics->s8RSSI)); strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrStatistics->s8RSSI));
u32WidsCount++; u32WidsCount++;
strWIDList[u32WidsCount].u16WIDid = WID_SUCCESS_FRAME_COUNT; strWIDList[u32WidsCount].u16WIDid = WID_SUCCESS_FRAME_COUNT;
strWIDList[u32WidsCount].enuWIDtype = WID_INT; strWIDList[u32WidsCount].type = WID_INT;
strWIDList[u32WidsCount].s32ValueSize = sizeof(u32); strWIDList[u32WidsCount].s32ValueSize = sizeof(u32);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrStatistics->u32TxCount)); strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrStatistics->u32TxCount));
u32WidsCount++; u32WidsCount++;
strWIDList[u32WidsCount].u16WIDid = WID_RECEIVED_FRAGMENT_COUNT; strWIDList[u32WidsCount].u16WIDid = WID_RECEIVED_FRAGMENT_COUNT;
strWIDList[u32WidsCount].enuWIDtype = WID_INT; strWIDList[u32WidsCount].type = WID_INT;
strWIDList[u32WidsCount].s32ValueSize = sizeof(u32); strWIDList[u32WidsCount].s32ValueSize = sizeof(u32);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrStatistics->u32RxCount)); strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrStatistics->u32RxCount));
u32WidsCount++; u32WidsCount++;
strWIDList[u32WidsCount].u16WIDid = WID_FAILED_COUNT; strWIDList[u32WidsCount].u16WIDid = WID_FAILED_COUNT;
strWIDList[u32WidsCount].enuWIDtype = WID_INT; strWIDList[u32WidsCount].type = WID_INT;
strWIDList[u32WidsCount].s32ValueSize = sizeof(u32); strWIDList[u32WidsCount].s32ValueSize = sizeof(u32);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrStatistics->u32TxFailureCount)); strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrStatistics->u32TxFailureCount));
u32WidsCount++; u32WidsCount++;
...@@ -3055,7 +3055,7 @@ static s32 Handle_Get_InActiveTime(struct host_if_drv *drvHandler, ...@@ -3055,7 +3055,7 @@ static s32 Handle_Get_InActiveTime(struct host_if_drv *drvHandler,
strWID.u16WIDid = (u16)WID_SET_STA_MAC_INACTIVE_TIME; strWID.u16WIDid = (u16)WID_SET_STA_MAC_INACTIVE_TIME;
strWID.enuWIDtype = WID_STR; strWID.type = WID_STR;
strWID.s32ValueSize = ETH_ALEN; strWID.s32ValueSize = ETH_ALEN;
strWID.ps8WidVal = kmalloc(strWID.s32ValueSize, GFP_KERNEL); strWID.ps8WidVal = kmalloc(strWID.s32ValueSize, GFP_KERNEL);
...@@ -3077,7 +3077,7 @@ static s32 Handle_Get_InActiveTime(struct host_if_drv *drvHandler, ...@@ -3077,7 +3077,7 @@ static s32 Handle_Get_InActiveTime(struct host_if_drv *drvHandler,
strWID.u16WIDid = (u16)WID_GET_INACTIVE_TIME; strWID.u16WIDid = (u16)WID_GET_INACTIVE_TIME;
strWID.enuWIDtype = WID_INT; strWID.type = WID_INT;
strWID.ps8WidVal = (s8 *)&gu32InactiveTime; strWID.ps8WidVal = (s8 *)&gu32InactiveTime;
strWID.s32ValueSize = sizeof(u32); strWID.s32ValueSize = sizeof(u32);
...@@ -3122,7 +3122,7 @@ static void Handle_AddBeacon(struct host_if_drv *drvHandler, ...@@ -3122,7 +3122,7 @@ static void Handle_AddBeacon(struct host_if_drv *drvHandler,
PRINT_D(HOSTINF_DBG, "Adding BEACON\n"); PRINT_D(HOSTINF_DBG, "Adding BEACON\n");
strWID.u16WIDid = (u16)WID_ADD_BEACON; strWID.u16WIDid = (u16)WID_ADD_BEACON;
strWID.enuWIDtype = WID_BIN; strWID.type = WID_BIN;
strWID.s32ValueSize = pstrSetBeaconParam->u32HeadLen + pstrSetBeaconParam->u32TailLen + 16; strWID.s32ValueSize = pstrSetBeaconParam->u32HeadLen + pstrSetBeaconParam->u32TailLen + 16;
strWID.ps8WidVal = kmalloc(strWID.s32ValueSize, GFP_KERNEL); strWID.ps8WidVal = kmalloc(strWID.s32ValueSize, GFP_KERNEL);
if (strWID.ps8WidVal == NULL) if (strWID.ps8WidVal == NULL)
...@@ -3188,7 +3188,7 @@ static void Handle_DelBeacon(struct host_if_drv *drvHandler) ...@@ -3188,7 +3188,7 @@ static void Handle_DelBeacon(struct host_if_drv *drvHandler)
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
strWID.u16WIDid = (u16)WID_DEL_BEACON; strWID.u16WIDid = (u16)WID_DEL_BEACON;
strWID.enuWIDtype = WID_CHAR; strWID.type = WID_CHAR;
strWID.s32ValueSize = sizeof(char); strWID.s32ValueSize = sizeof(char);
strWID.ps8WidVal = &gu8DelBcn; strWID.ps8WidVal = &gu8DelBcn;
...@@ -3282,7 +3282,7 @@ static void Handle_AddStation(struct host_if_drv *drvHandler, ...@@ -3282,7 +3282,7 @@ static void Handle_AddStation(struct host_if_drv *drvHandler,
PRINT_D(HOSTINF_DBG, "Handling add station\n"); PRINT_D(HOSTINF_DBG, "Handling add station\n");
strWID.u16WIDid = (u16)WID_ADD_STA; strWID.u16WIDid = (u16)WID_ADD_STA;
strWID.enuWIDtype = WID_BIN; strWID.type = WID_BIN;
strWID.s32ValueSize = WILC_ADD_STA_LENGTH + pstrStationParam->u8NumRates; strWID.s32ValueSize = WILC_ADD_STA_LENGTH + pstrStationParam->u8NumRates;
strWID.ps8WidVal = kmalloc(strWID.s32ValueSize, GFP_KERNEL); strWID.ps8WidVal = kmalloc(strWID.s32ValueSize, GFP_KERNEL);
...@@ -3324,7 +3324,7 @@ static void Handle_DelAllSta(struct host_if_drv *drvHandler, ...@@ -3324,7 +3324,7 @@ static void Handle_DelAllSta(struct host_if_drv *drvHandler,
u8 au8Zero_Buff[6] = {0}; u8 au8Zero_Buff[6] = {0};
strWID.u16WIDid = (u16)WID_DEL_ALL_STA; strWID.u16WIDid = (u16)WID_DEL_ALL_STA;
strWID.enuWIDtype = WID_STR; strWID.type = WID_STR;
strWID.s32ValueSize = (pstrDelAllStaParam->u8Num_AssocSta * ETH_ALEN) + 1; strWID.s32ValueSize = (pstrDelAllStaParam->u8Num_AssocSta * ETH_ALEN) + 1;
PRINT_D(HOSTINF_DBG, "Handling delete station\n"); PRINT_D(HOSTINF_DBG, "Handling delete station\n");
...@@ -3377,7 +3377,7 @@ static void Handle_DelStation(struct host_if_drv *drvHandler, ...@@ -3377,7 +3377,7 @@ static void Handle_DelStation(struct host_if_drv *drvHandler,
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
strWID.u16WIDid = (u16)WID_REMOVE_STA; strWID.u16WIDid = (u16)WID_REMOVE_STA;
strWID.enuWIDtype = WID_BIN; strWID.type = WID_BIN;
strWID.s32ValueSize = ETH_ALEN; strWID.s32ValueSize = ETH_ALEN;
PRINT_D(HOSTINF_DBG, "Handling delete station\n"); PRINT_D(HOSTINF_DBG, "Handling delete station\n");
...@@ -3419,7 +3419,7 @@ static void Handle_EditStation(struct host_if_drv *drvHandler, ...@@ -3419,7 +3419,7 @@ static void Handle_EditStation(struct host_if_drv *drvHandler,
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler; struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
strWID.u16WIDid = (u16)WID_EDIT_STA; strWID.u16WIDid = (u16)WID_EDIT_STA;
strWID.enuWIDtype = WID_BIN; strWID.type = WID_BIN;
strWID.s32ValueSize = WILC_ADD_STA_LENGTH + pstrStationParam->u8NumRates; strWID.s32ValueSize = WILC_ADD_STA_LENGTH + pstrStationParam->u8NumRates;
PRINT_D(HOSTINF_DBG, "Handling edit station\n"); PRINT_D(HOSTINF_DBG, "Handling edit station\n");
...@@ -3492,7 +3492,7 @@ static int Handle_RemainOnChan(struct host_if_drv *drvHandler, ...@@ -3492,7 +3492,7 @@ static int Handle_RemainOnChan(struct host_if_drv *drvHandler,
u8remain_on_chan_flag = true; u8remain_on_chan_flag = true;
strWID.u16WIDid = (u16)WID_REMAIN_ON_CHAN; strWID.u16WIDid = (u16)WID_REMAIN_ON_CHAN;
strWID.enuWIDtype = WID_STR; strWID.type = WID_STR;
strWID.s32ValueSize = 2; strWID.s32ValueSize = 2;
strWID.ps8WidVal = kmalloc(strWID.s32ValueSize, GFP_KERNEL); strWID.ps8WidVal = kmalloc(strWID.s32ValueSize, GFP_KERNEL);
...@@ -3549,7 +3549,7 @@ static int Handle_RegisterFrame(struct host_if_drv *drvHandler, ...@@ -3549,7 +3549,7 @@ static int Handle_RegisterFrame(struct host_if_drv *drvHandler,
/*prepare configuration packet*/ /*prepare configuration packet*/
strWID.u16WIDid = (u16)WID_REGISTER_FRAME; strWID.u16WIDid = (u16)WID_REGISTER_FRAME;
strWID.enuWIDtype = WID_STR; strWID.type = WID_STR;
strWID.ps8WidVal = kmalloc(sizeof(u16) + 2, GFP_KERNEL); strWID.ps8WidVal = kmalloc(sizeof(u16) + 2, GFP_KERNEL);
if (strWID.ps8WidVal == NULL) if (strWID.ps8WidVal == NULL)
return -ENOMEM; return -ENOMEM;
...@@ -3601,7 +3601,7 @@ static u32 Handle_ListenStateExpired(struct host_if_drv *drvHandler, ...@@ -3601,7 +3601,7 @@ static u32 Handle_ListenStateExpired(struct host_if_drv *drvHandler,
if (P2P_LISTEN_STATE) { if (P2P_LISTEN_STATE) {
u8remain_on_chan_flag = false; u8remain_on_chan_flag = false;
strWID.u16WIDid = (u16)WID_REMAIN_ON_CHAN; strWID.u16WIDid = (u16)WID_REMAIN_ON_CHAN;
strWID.enuWIDtype = WID_STR; strWID.type = WID_STR;
strWID.s32ValueSize = 2; strWID.s32ValueSize = 2;
strWID.ps8WidVal = kmalloc(strWID.s32ValueSize, GFP_KERNEL); strWID.ps8WidVal = kmalloc(strWID.s32ValueSize, GFP_KERNEL);
...@@ -3718,7 +3718,7 @@ static void Handle_SetMulticastFilter(struct host_if_drv *drvHandler, ...@@ -3718,7 +3718,7 @@ static void Handle_SetMulticastFilter(struct host_if_drv *drvHandler,
PRINT_D(HOSTINF_DBG, "Setup Multicast Filter\n"); PRINT_D(HOSTINF_DBG, "Setup Multicast Filter\n");
strWID.u16WIDid = (u16)WID_SETUP_MULTICAST_FILTER; strWID.u16WIDid = (u16)WID_SETUP_MULTICAST_FILTER;
strWID.enuWIDtype = WID_BIN; strWID.type = WID_BIN;
strWID.s32ValueSize = sizeof(struct set_multicast) + ((strHostIfSetMulti->u32count) * ETH_ALEN); strWID.s32ValueSize = sizeof(struct set_multicast) + ((strHostIfSetMulti->u32count) * ETH_ALEN);
strWID.ps8WidVal = kmalloc(strWID.s32ValueSize, GFP_KERNEL); strWID.ps8WidVal = kmalloc(strWID.s32ValueSize, GFP_KERNEL);
if (strWID.ps8WidVal == NULL) if (strWID.ps8WidVal == NULL)
...@@ -3777,7 +3777,7 @@ static s32 Handle_AddBASession(struct host_if_drv *drvHandler, ...@@ -3777,7 +3777,7 @@ static s32 Handle_AddBASession(struct host_if_drv *drvHandler,
strHostIfBASessionInfo->u8Ted); strHostIfBASessionInfo->u8Ted);
strWID.u16WIDid = (u16)WID_11E_P_ACTION_REQ; strWID.u16WIDid = (u16)WID_11E_P_ACTION_REQ;
strWID.enuWIDtype = WID_STR; strWID.type = WID_STR;
strWID.ps8WidVal = kmalloc(BLOCK_ACK_REQ_SIZE, GFP_KERNEL); strWID.ps8WidVal = kmalloc(BLOCK_ACK_REQ_SIZE, GFP_KERNEL);
strWID.s32ValueSize = BLOCK_ACK_REQ_SIZE; strWID.s32ValueSize = BLOCK_ACK_REQ_SIZE;
ptr = strWID.ps8WidVal; ptr = strWID.ps8WidVal;
...@@ -3811,7 +3811,7 @@ static s32 Handle_AddBASession(struct host_if_drv *drvHandler, ...@@ -3811,7 +3811,7 @@ static s32 Handle_AddBASession(struct host_if_drv *drvHandler,
strWID.u16WIDid = (u16)WID_11E_P_ACTION_REQ; strWID.u16WIDid = (u16)WID_11E_P_ACTION_REQ;
strWID.enuWIDtype = WID_STR; strWID.type = WID_STR;
strWID.s32ValueSize = 15; strWID.s32ValueSize = 15;
ptr = strWID.ps8WidVal; ptr = strWID.ps8WidVal;
/* *ptr++ = 0x14; */ /* *ptr++ = 0x14; */
...@@ -3863,7 +3863,7 @@ static s32 Handle_DelAllRxBASessions(struct host_if_drv *drvHandler, ...@@ -3863,7 +3863,7 @@ static s32 Handle_DelAllRxBASessions(struct host_if_drv *drvHandler,
strHostIfBASessionInfo->u8Ted); strHostIfBASessionInfo->u8Ted);
strWID.u16WIDid = (u16)WID_DEL_ALL_RX_BA; strWID.u16WIDid = (u16)WID_DEL_ALL_RX_BA;
strWID.enuWIDtype = WID_STR; strWID.type = WID_STR;
strWID.ps8WidVal = kmalloc(BLOCK_ACK_REQ_SIZE, GFP_KERNEL); strWID.ps8WidVal = kmalloc(BLOCK_ACK_REQ_SIZE, GFP_KERNEL);
strWID.s32ValueSize = BLOCK_ACK_REQ_SIZE; strWID.s32ValueSize = BLOCK_ACK_REQ_SIZE;
ptr = strWID.ps8WidVal; ptr = strWID.ps8WidVal;
...@@ -4162,7 +4162,7 @@ s32 host_int_remove_key(struct host_if_drv *hWFIDrv, const u8 *pu8StaAddress) ...@@ -4162,7 +4162,7 @@ s32 host_int_remove_key(struct host_if_drv *hWFIDrv, const u8 *pu8StaAddress)
struct wid strWID; struct wid strWID;
strWID.u16WIDid = (u16)WID_REMOVE_KEY; strWID.u16WIDid = (u16)WID_REMOVE_KEY;
strWID.enuWIDtype = WID_STR; strWID.type = WID_STR;
strWID.ps8WidVal = (s8 *)pu8StaAddress; strWID.ps8WidVal = (s8 *)pu8StaAddress;
strWID.s32ValueSize = 6; strWID.s32ValueSize = 6;
...@@ -4679,7 +4679,7 @@ s32 host_int_get_pmkid_info(struct host_if_drv *hWFIDrv, u8 *pu8PmkidInfoArray, ...@@ -4679,7 +4679,7 @@ s32 host_int_get_pmkid_info(struct host_if_drv *hWFIDrv, u8 *pu8PmkidInfoArray,
struct wid strWID; struct wid strWID;
strWID.u16WIDid = (u16)WID_PMKID_INFO; strWID.u16WIDid = (u16)WID_PMKID_INFO;
strWID.enuWIDtype = WID_STR; strWID.type = WID_STR;
strWID.s32ValueSize = u32PmkidInfoLen; strWID.s32ValueSize = u32PmkidInfoLen;
strWID.ps8WidVal = pu8PmkidInfoArray; strWID.ps8WidVal = pu8PmkidInfoArray;
...@@ -4708,7 +4708,7 @@ s32 host_int_set_RSNAConfigPSKPassPhrase(struct host_if_drv *hWFIDrv, u8 *pu8Pas ...@@ -4708,7 +4708,7 @@ s32 host_int_set_RSNAConfigPSKPassPhrase(struct host_if_drv *hWFIDrv, u8 *pu8Pas
/*validating psk length*/ /*validating psk length*/
if ((u8Psklength > 7) && (u8Psklength < 65)) { if ((u8Psklength > 7) && (u8Psklength < 65)) {
strWID.u16WIDid = (u16)WID_11I_PSK; strWID.u16WIDid = (u16)WID_11I_PSK;
strWID.enuWIDtype = WID_STR; strWID.type = WID_STR;
strWID.ps8WidVal = pu8PassPhrase; strWID.ps8WidVal = pu8PassPhrase;
strWID.s32ValueSize = u8Psklength; strWID.s32ValueSize = u8Psklength;
} }
...@@ -4801,7 +4801,7 @@ s32 host_int_get_RSNAConfigPSKPassPhrase(struct host_if_drv *hWFIDrv, ...@@ -4801,7 +4801,7 @@ s32 host_int_get_RSNAConfigPSKPassPhrase(struct host_if_drv *hWFIDrv,
struct wid strWID; struct wid strWID;
strWID.u16WIDid = (u16)WID_11I_PSK; strWID.u16WIDid = (u16)WID_11I_PSK;
strWID.enuWIDtype = WID_STR; strWID.type = WID_STR;
strWID.s32ValueSize = u8Psklength; strWID.s32ValueSize = u8Psklength;
strWID.ps8WidVal = pu8PassPhrase; strWID.ps8WidVal = pu8PassPhrase;
...@@ -4828,7 +4828,7 @@ s32 host_int_set_start_scan_req(struct host_if_drv *hWFIDrv, u8 scanSource) ...@@ -4828,7 +4828,7 @@ s32 host_int_set_start_scan_req(struct host_if_drv *hWFIDrv, u8 scanSource)
struct wid strWID; struct wid strWID;
strWID.u16WIDid = (u16)WID_START_SCAN_REQ; strWID.u16WIDid = (u16)WID_START_SCAN_REQ;
strWID.enuWIDtype = WID_CHAR; strWID.type = WID_CHAR;
strWID.ps8WidVal = (s8 *)&scanSource; strWID.ps8WidVal = (s8 *)&scanSource;
strWID.s32ValueSize = sizeof(char); strWID.s32ValueSize = sizeof(char);
...@@ -4856,7 +4856,7 @@ s32 host_int_get_start_scan_req(struct host_if_drv *hWFIDrv, u8 *pu8ScanSource) ...@@ -4856,7 +4856,7 @@ s32 host_int_get_start_scan_req(struct host_if_drv *hWFIDrv, u8 *pu8ScanSource)
struct wid strWID; struct wid strWID;
strWID.u16WIDid = (u16)WID_START_SCAN_REQ; strWID.u16WIDid = (u16)WID_START_SCAN_REQ;
strWID.enuWIDtype = WID_CHAR; strWID.type = WID_CHAR;
strWID.ps8WidVal = (s8 *)pu8ScanSource; strWID.ps8WidVal = (s8 *)pu8ScanSource;
strWID.s32ValueSize = sizeof(char); strWID.s32ValueSize = sizeof(char);
...@@ -5053,7 +5053,7 @@ s32 host_int_disconnect_station(struct host_if_drv *hWFIDrv, u8 assoc_id) ...@@ -5053,7 +5053,7 @@ s32 host_int_disconnect_station(struct host_if_drv *hWFIDrv, u8 assoc_id)
struct wid strWID; struct wid strWID;
strWID.u16WIDid = (u16)WID_DISCONNECT; strWID.u16WIDid = (u16)WID_DISCONNECT;
strWID.enuWIDtype = WID_CHAR; strWID.type = WID_CHAR;
strWID.ps8WidVal = (s8 *)&assoc_id; strWID.ps8WidVal = (s8 *)&assoc_id;
strWID.s32ValueSize = sizeof(char); strWID.s32ValueSize = sizeof(char);
...@@ -5092,7 +5092,7 @@ s32 host_int_get_assoc_req_info(struct host_if_drv *hWFIDrv, u8 *pu8AssocReqInfo ...@@ -5092,7 +5092,7 @@ s32 host_int_get_assoc_req_info(struct host_if_drv *hWFIDrv, u8 *pu8AssocReqInfo
struct wid strWID; struct wid strWID;
strWID.u16WIDid = (u16)WID_ASSOC_REQ_INFO; strWID.u16WIDid = (u16)WID_ASSOC_REQ_INFO;
strWID.enuWIDtype = WID_STR; strWID.type = WID_STR;
strWID.ps8WidVal = pu8AssocReqInfo; strWID.ps8WidVal = pu8AssocReqInfo;
strWID.s32ValueSize = u32AssocReqInfoLen; strWID.s32ValueSize = u32AssocReqInfoLen;
...@@ -5123,7 +5123,7 @@ s32 host_int_get_assoc_res_info(struct host_if_drv *hWFIDrv, u8 *pu8AssocRespInf ...@@ -5123,7 +5123,7 @@ s32 host_int_get_assoc_res_info(struct host_if_drv *hWFIDrv, u8 *pu8AssocRespInf
} }
strWID.u16WIDid = (u16)WID_ASSOC_RES_INFO; strWID.u16WIDid = (u16)WID_ASSOC_RES_INFO;
strWID.enuWIDtype = WID_STR; strWID.type = WID_STR;
strWID.ps8WidVal = pu8AssocRespInfo; strWID.ps8WidVal = pu8AssocRespInfo;
strWID.s32ValueSize = u32MaxAssocRespInfoLen; strWID.s32ValueSize = u32MaxAssocRespInfoLen;
...@@ -5163,7 +5163,7 @@ s32 host_int_get_rx_power_level(struct host_if_drv *hWFIDrv, u8 *pu8RxPowerLevel ...@@ -5163,7 +5163,7 @@ s32 host_int_get_rx_power_level(struct host_if_drv *hWFIDrv, u8 *pu8RxPowerLevel
struct wid strWID; struct wid strWID;
strWID.u16WIDid = (u16)WID_RX_POWER_LEVEL; strWID.u16WIDid = (u16)WID_RX_POWER_LEVEL;
strWID.enuWIDtype = WID_STR; strWID.type = WID_STR;
strWID.ps8WidVal = pu8RxPowerLevel; strWID.ps8WidVal = pu8RxPowerLevel;
strWID.s32ValueSize = u32RxPowerLevelLen; strWID.s32ValueSize = u32RxPowerLevelLen;
...@@ -5389,7 +5389,7 @@ s32 host_int_test_get_int_wid(struct host_if_drv *hWFIDrv, u32 *pu32TestMemAddr) ...@@ -5389,7 +5389,7 @@ s32 host_int_test_get_int_wid(struct host_if_drv *hWFIDrv, u32 *pu32TestMemAddr)
} }
strWID.u16WIDid = (u16)WID_MEMORY_ADDRESS; strWID.u16WIDid = (u16)WID_MEMORY_ADDRESS;
strWID.enuWIDtype = WID_INT; strWID.type = WID_INT;
strWID.ps8WidVal = (s8 *)pu32TestMemAddr; strWID.ps8WidVal = (s8 *)pu32TestMemAddr;
strWID.s32ValueSize = sizeof(u32); strWID.s32ValueSize = sizeof(u32);
......
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