From patchwork Tue Oct 6 09:42:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Cho X-Patchwork-Id: 7334181 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9723E9F1B9 for ; Tue, 6 Oct 2015 09:43:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 045242065A for ; Tue, 6 Oct 2015 09:43:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1346E20658 for ; Tue, 6 Oct 2015 09:43:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752193AbbJFJnI (ORCPT ); Tue, 6 Oct 2015 05:43:08 -0400 Received: from eusmtp01.atmel.com ([212.144.249.243]:18784 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751785AbbJFJnH (ORCPT ); Tue, 6 Oct 2015 05:43:07 -0400 Received: from tony-itx.corp.atmel.com (10.161.101.13) by eusmtp01.atmel.com (10.161.101.31) with Microsoft SMTP Server id 14.3.235.1; Tue, 6 Oct 2015 11:43:03 +0200 From: Tony Cho To: CC: , , , , , , , , , , , Subject: [PATCH 05/10] staging: wilc1000: rename the member variable, s32ValueSize of wid Date: Tue, 6 Oct 2015 18:42:16 +0900 Message-ID: <1444124541-5663-5-git-send-email-tony.cho@atmel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1444124541-5663-1-git-send-email-tony.cho@atmel.com> References: <1444124541-5663-1-git-send-email-tony.cho@atmel.com> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Leo Kim This patch renames s32ValueSize of struct wid to size. Signed-off-by: Leo Kim Signed-off-by: Tony Cho --- drivers/staging/wilc1000/coreconfigurator.c | 6 +- drivers/staging/wilc1000/coreconfigurator.h | 2 +- drivers/staging/wilc1000/host_interface.c | 210 ++++++++++++++-------------- 3 files changed, 109 insertions(+), 109 deletions(-) diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c index 87636c0..c7cef57 100644 --- a/drivers/staging/wilc1000/coreconfigurator.c +++ b/drivers/staging/wilc1000/coreconfigurator.c @@ -614,10 +614,10 @@ s32 send_config_pkt(u8 mode, struct wid *wids, u32 count, u32 drv) } counter = 0; for (counter = 0; counter < count; counter++) { - wids[counter].s32ValueSize = wilc_wlan_cfg_get_val( + wids[counter].size = wilc_wlan_cfg_get_val( wids[counter].id, wids[counter].ps8WidVal, - wids[counter].s32ValueSize); + wids[counter].size); } } else if (mode == SET_CFG) { @@ -626,7 +626,7 @@ s32 send_config_pkt(u8 mode, struct wid *wids, u32 count, u32 drv) if (!wilc_wlan_cfg_set(!counter, wids[counter].id, wids[counter].ps8WidVal, - wids[counter].s32ValueSize, + wids[counter].size, (counter == count - 1), drv)) { ret = -1; diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h index 0d3bff7..3595a0a 100644 --- a/drivers/staging/wilc1000/coreconfigurator.h +++ b/drivers/staging/wilc1000/coreconfigurator.h @@ -73,7 +73,7 @@ typedef enum { struct wid { u16 id; enum WID_TYPE type; - s32 s32ValueSize; + s32 size; s8 *ps8WidVal; }; diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 15c1781..7f529cc 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -578,7 +578,7 @@ static s32 Handle_SetChannel(struct host_if_drv *drvHandler, strWID.id = (u16)WID_CURRENT_CHANNEL; strWID.type = WID_CHAR; strWID.ps8WidVal = (char *)&(pstrHostIFSetChan->u8SetChan); - strWID.s32ValueSize = sizeof(char); + strWID.size = sizeof(char); PRINT_D(HOSTINF_DBG, "Setting channel\n"); /*Sending Cfg*/ @@ -614,7 +614,7 @@ static s32 Handle_SetWfiDrvHandler(struct host_if_drv *drvHandler, strWID.id = (u16)WID_SET_DRV_HANDLER; strWID.type = WID_INT; strWID.ps8WidVal = (s8 *)&(pstrHostIfSetDrvHandler->u32Address); - strWID.s32ValueSize = sizeof(u32); + strWID.size = sizeof(u32); /*Sending Cfg*/ @@ -655,7 +655,7 @@ static s32 Handle_SetOperationMode(struct host_if_drv *drvHandler, strWID.id = (u16)WID_SET_OPERATION_MODE; strWID.type = WID_INT; strWID.ps8WidVal = (s8 *)&(pstrHostIfSetOperationMode->u32Mode); - strWID.s32ValueSize = sizeof(u32); + strWID.size = sizeof(u32); /*Sending Cfg*/ PRINT_INFO(HOSTINF_DBG, "pstrWFIDrv= %p\n", pstrWFIDrv); @@ -704,7 +704,7 @@ s32 Handle_set_IPAddress(struct host_if_drv *drvHandler, u8 *pu8IPAddr, u8 idx) strWID.id = (u16)WID_IP_ADDRESS; strWID.type = WID_STR; strWID.ps8WidVal = (u8 *)pu8IPAddr; - strWID.s32ValueSize = IP_ALEN; + strWID.size = IP_ALEN; s32Error = send_config_pkt(SET_CFG, &strWID, 1, get_id_from_handler(pstrWFIDrv)); @@ -743,7 +743,7 @@ s32 Handle_get_IPAddress(struct host_if_drv *drvHandler, u8 *pu8IPAddr, u8 idx) strWID.id = (u16)WID_IP_ADDRESS; strWID.type = WID_STR; strWID.ps8WidVal = kmalloc(IP_ALEN, GFP_KERNEL); - strWID.s32ValueSize = IP_ALEN; + strWID.size = IP_ALEN; s32Error = send_config_pkt(GET_CFG, &strWID, 1, get_id_from_handler(pstrWFIDrv)); @@ -799,7 +799,7 @@ static s32 Handle_SetMacAddress(struct host_if_drv *drvHandler, strWID.id = (u16)WID_MAC_ADDR; strWID.type = WID_STR; strWID.ps8WidVal = mac_buf; - strWID.s32ValueSize = ETH_ALEN; + strWID.size = ETH_ALEN; PRINT_D(GENERIC_DBG, "mac addr = :%pM\n", strWID.ps8WidVal); /*Sending Cfg*/ s32Error = send_config_pkt(SET_CFG, &strWID, 1, @@ -834,7 +834,7 @@ static s32 Handle_GetMacAddress(struct host_if_drv *drvHandler, strWID.id = (u16)WID_MAC_ADDR; strWID.type = WID_STR; strWID.ps8WidVal = pstrHostIfGetMacAddress->u8MacAddress; - strWID.s32ValueSize = ETH_ALEN; + strWID.size = ETH_ALEN; /*Sending Cfg*/ s32Error = send_config_pkt(GET_CFG, &strWID, 1, @@ -883,7 +883,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, strWIDList[u8WidCnt].id = WID_BSS_TYPE; strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.bss_type; strWIDList[u8WidCnt].type = WID_CHAR; - strWIDList[u8WidCnt].s32ValueSize = sizeof(char); + strWIDList[u8WidCnt].size = sizeof(char); pstrWFIDrv->strCfgValues.bss_type = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.bss_type; } else { PRINT_ER("check value 6 over\n"); @@ -903,7 +903,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, strWIDList[u8WidCnt].id = WID_AUTH_TYPE; strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.auth_type; strWIDList[u8WidCnt].type = WID_CHAR; - strWIDList[u8WidCnt].s32ValueSize = sizeof(char); + strWIDList[u8WidCnt].size = sizeof(char); pstrWFIDrv->strCfgValues.auth_type = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.auth_type; } else { PRINT_ER("Impossible value \n"); @@ -918,7 +918,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, strWIDList[u8WidCnt].id = WID_AUTH_TIMEOUT; strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.auth_timeout; strWIDList[u8WidCnt].type = WID_SHORT; - strWIDList[u8WidCnt].s32ValueSize = sizeof(u16); + strWIDList[u8WidCnt].size = sizeof(u16); pstrWFIDrv->strCfgValues.auth_timeout = strHostIFCfgParamAttr->pstrCfgParamVal.auth_timeout; } else { PRINT_ER("Range(1 ~ 65535) over\n"); @@ -939,7 +939,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, strWIDList[u8WidCnt].id = WID_POWER_MANAGEMENT; strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.power_mgmt_mode; strWIDList[u8WidCnt].type = WID_CHAR; - strWIDList[u8WidCnt].s32ValueSize = sizeof(char); + strWIDList[u8WidCnt].size = sizeof(char); pstrWFIDrv->strCfgValues.power_mgmt_mode = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.power_mgmt_mode; } else { PRINT_ER("Invalide power mode\n"); @@ -954,7 +954,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, strWIDList[u8WidCnt].id = WID_SHORT_RETRY_LIMIT; strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.short_retry_limit; strWIDList[u8WidCnt].type = WID_SHORT; - strWIDList[u8WidCnt].s32ValueSize = sizeof(u16); + strWIDList[u8WidCnt].size = sizeof(u16); pstrWFIDrv->strCfgValues.short_retry_limit = strHostIFCfgParamAttr->pstrCfgParamVal.short_retry_limit; } else { PRINT_ER("Range(1~256) over\n"); @@ -970,7 +970,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.long_retry_limit; strWIDList[u8WidCnt].type = WID_SHORT; - strWIDList[u8WidCnt].s32ValueSize = sizeof(u16); + strWIDList[u8WidCnt].size = sizeof(u16); pstrWFIDrv->strCfgValues.long_retry_limit = strHostIFCfgParamAttr->pstrCfgParamVal.long_retry_limit; } else { PRINT_ER("Range(1~256) over\n"); @@ -985,7 +985,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, strWIDList[u8WidCnt].id = WID_FRAG_THRESHOLD; strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.frag_threshold; strWIDList[u8WidCnt].type = WID_SHORT; - strWIDList[u8WidCnt].s32ValueSize = sizeof(u16); + strWIDList[u8WidCnt].size = sizeof(u16); pstrWFIDrv->strCfgValues.frag_threshold = strHostIFCfgParamAttr->pstrCfgParamVal.frag_threshold; } else { PRINT_ER("Threshold Range fail\n"); @@ -1000,7 +1000,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, strWIDList[u8WidCnt].id = WID_RTS_THRESHOLD; strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.rts_threshold; strWIDList[u8WidCnt].type = WID_SHORT; - strWIDList[u8WidCnt].s32ValueSize = sizeof(u16); + strWIDList[u8WidCnt].size = sizeof(u16); pstrWFIDrv->strCfgValues.rts_threshold = strHostIFCfgParamAttr->pstrCfgParamVal.rts_threshold; } else { PRINT_ER("Threshold Range fail\n"); @@ -1019,7 +1019,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, strWIDList[u8WidCnt].id = WID_PREAMBLE; strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.preamble_type; strWIDList[u8WidCnt].type = WID_CHAR; - strWIDList[u8WidCnt].s32ValueSize = sizeof(char); + strWIDList[u8WidCnt].size = sizeof(char); pstrWFIDrv->strCfgValues.preamble_type = strHostIFCfgParamAttr->pstrCfgParamVal.preamble_type; } else { PRINT_ER("Preamle Range(0~2) over\n"); @@ -1033,7 +1033,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, strWIDList[u8WidCnt].id = WID_SHORT_SLOT_ALLOWED; strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.short_slot_allowed; strWIDList[u8WidCnt].type = WID_CHAR; - strWIDList[u8WidCnt].s32ValueSize = sizeof(char); + strWIDList[u8WidCnt].size = sizeof(char); pstrWFIDrv->strCfgValues.short_slot_allowed = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.short_slot_allowed; } else { PRINT_ER("Short slot(2) over\n"); @@ -1051,7 +1051,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, strWIDList[u8WidCnt].id = WID_11N_TXOP_PROT_DISABLE; strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.txop_prot_disabled; strWIDList[u8WidCnt].type = WID_CHAR; - strWIDList[u8WidCnt].s32ValueSize = sizeof(char); + strWIDList[u8WidCnt].size = sizeof(char); pstrWFIDrv->strCfgValues.txop_prot_disabled = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.txop_prot_disabled; } else { PRINT_ER("TXOP prot disable\n"); @@ -1066,7 +1066,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, strWIDList[u8WidCnt].id = WID_BEACON_INTERVAL; strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.beacon_interval; strWIDList[u8WidCnt].type = WID_SHORT; - strWIDList[u8WidCnt].s32ValueSize = sizeof(u16); + strWIDList[u8WidCnt].size = sizeof(u16); pstrWFIDrv->strCfgValues.beacon_interval = strHostIFCfgParamAttr->pstrCfgParamVal.beacon_interval; } else { PRINT_ER("Beacon interval(1~65535) fail\n"); @@ -1081,7 +1081,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, strWIDList[u8WidCnt].id = WID_DTIM_PERIOD; strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.dtim_period; strWIDList[u8WidCnt].type = WID_CHAR; - strWIDList[u8WidCnt].s32ValueSize = sizeof(char); + strWIDList[u8WidCnt].size = sizeof(char); pstrWFIDrv->strCfgValues.dtim_period = strHostIFCfgParamAttr->pstrCfgParamVal.dtim_period; } else { PRINT_ER("DTIM range(1~255) fail\n"); @@ -1100,7 +1100,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, strWIDList[u8WidCnt].id = WID_SITE_SURVEY; strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.site_survey_enabled; strWIDList[u8WidCnt].type = WID_CHAR; - strWIDList[u8WidCnt].s32ValueSize = sizeof(char); + strWIDList[u8WidCnt].size = sizeof(char); pstrWFIDrv->strCfgValues.site_survey_enabled = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.site_survey_enabled; } else { PRINT_ER("Site survey disable\n"); @@ -1115,7 +1115,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, strWIDList[u8WidCnt].id = WID_SITE_SURVEY_SCAN_TIME; strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.site_survey_scan_time; strWIDList[u8WidCnt].type = WID_SHORT; - strWIDList[u8WidCnt].s32ValueSize = sizeof(u16); + strWIDList[u8WidCnt].size = sizeof(u16); pstrWFIDrv->strCfgValues.site_survey_scan_time = strHostIFCfgParamAttr->pstrCfgParamVal.site_survey_scan_time; } else { PRINT_ER("Site survey scan time(1~65535) over\n"); @@ -1130,7 +1130,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, strWIDList[u8WidCnt].id = WID_ACTIVE_SCAN_TIME; strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.active_scan_time; strWIDList[u8WidCnt].type = WID_SHORT; - strWIDList[u8WidCnt].s32ValueSize = sizeof(u16); + strWIDList[u8WidCnt].size = sizeof(u16); pstrWFIDrv->strCfgValues.active_scan_time = strHostIFCfgParamAttr->pstrCfgParamVal.active_scan_time; } else { PRINT_ER("Active scan time(1~65535) over\n"); @@ -1145,7 +1145,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, strWIDList[u8WidCnt].id = WID_PASSIVE_SCAN_TIME; strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.passive_scan_time; strWIDList[u8WidCnt].type = WID_SHORT; - strWIDList[u8WidCnt].s32ValueSize = sizeof(u16); + strWIDList[u8WidCnt].size = sizeof(u16); pstrWFIDrv->strCfgValues.passive_scan_time = strHostIFCfgParamAttr->pstrCfgParamVal.passive_scan_time; } else { PRINT_ER("Passive scan time(1~65535) over\n"); @@ -1170,7 +1170,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, strWIDList[u8WidCnt].id = WID_CURRENT_TX_RATE; strWIDList[u8WidCnt].ps8WidVal = (s8 *)&curr_tx_rate; strWIDList[u8WidCnt].type = WID_SHORT; - strWIDList[u8WidCnt].s32ValueSize = sizeof(u16); + strWIDList[u8WidCnt].size = sizeof(u16); pstrWFIDrv->strCfgValues.curr_tx_rate = (u8)curr_tx_rate; } else { PRINT_ER("out of TX rate\n"); @@ -1276,7 +1276,7 @@ static s32 Handle_Scan(struct host_if_drv *drvHandler, - strWIDList[u32WidsCount].s32ValueSize = (s32)(valuesize + 1); + strWIDList[u32WidsCount].size = (s32)(valuesize + 1); u32WidsCount++; } @@ -1288,14 +1288,14 @@ static s32 Handle_Scan(struct host_if_drv *drvHandler, strWIDList[u32WidsCount].id = WID_INFO_ELEMENT_PROBE; strWIDList[u32WidsCount].type = WID_BIN_DATA; strWIDList[u32WidsCount].ps8WidVal = pstrHostIFscanAttr->pu8IEs; - strWIDList[u32WidsCount].s32ValueSize = pstrHostIFscanAttr->IEsLen; + strWIDList[u32WidsCount].size = pstrHostIFscanAttr->IEsLen; u32WidsCount++; } /*Scan Type*/ strWIDList[u32WidsCount].id = WID_SCAN_TYPE; strWIDList[u32WidsCount].type = WID_CHAR; - strWIDList[u32WidsCount].s32ValueSize = sizeof(char); + strWIDList[u32WidsCount].size = sizeof(char); strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrHostIFscanAttr->u8ScanType)); u32WidsCount++; @@ -1313,13 +1313,13 @@ static s32 Handle_Scan(struct host_if_drv *drvHandler, } strWIDList[u32WidsCount].ps8WidVal = pstrHostIFscanAttr->pu8ChnlFreqList; - strWIDList[u32WidsCount].s32ValueSize = pstrHostIFscanAttr->u8ChnlListLen; + strWIDList[u32WidsCount].size = pstrHostIFscanAttr->u8ChnlListLen; u32WidsCount++; /*Scan Request*/ strWIDList[u32WidsCount].id = WID_START_SCAN_REQ; strWIDList[u32WidsCount].type = WID_CHAR; - strWIDList[u32WidsCount].s32ValueSize = sizeof(char); + strWIDList[u32WidsCount].size = sizeof(char); strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrHostIFscanAttr->u8ScanSource)); u32WidsCount++; @@ -1403,7 +1403,7 @@ static s32 Handle_ScanDone(struct host_if_drv *drvHandler, tenuScanEvent enuEven strWID.id = (u16)WID_ABORT_RUNNING_SCAN; strWID.type = WID_CHAR; strWID.ps8WidVal = (s8 *)&u8abort_running_scan; - strWID.s32ValueSize = sizeof(char); + strWID.size = sizeof(char); /*Sending Cfg*/ s32Error = send_config_pkt(SET_CFG, &strWID, 1, @@ -1498,19 +1498,19 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler, strWIDList[u32WidsCount].id = WID_SUCCESS_FRAME_COUNT; strWIDList[u32WidsCount].type = WID_INT; - strWIDList[u32WidsCount].s32ValueSize = sizeof(u32); + strWIDList[u32WidsCount].size = sizeof(u32); strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(dummyval)); u32WidsCount++; strWIDList[u32WidsCount].id = WID_RECEIVED_FRAGMENT_COUNT; strWIDList[u32WidsCount].type = WID_INT; - strWIDList[u32WidsCount].s32ValueSize = sizeof(u32); + strWIDList[u32WidsCount].size = sizeof(u32); strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(dummyval)); u32WidsCount++; strWIDList[u32WidsCount].id = WID_FAILED_COUNT; strWIDList[u32WidsCount].type = WID_INT; - strWIDList[u32WidsCount].s32ValueSize = sizeof(u32); + strWIDList[u32WidsCount].size = sizeof(u32); strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(dummyval)); u32WidsCount++; @@ -1521,7 +1521,7 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler, strWIDList[u32WidsCount].id = WID_INFO_ELEMENT_ASSOCIATE; strWIDList[u32WidsCount].type = WID_BIN_DATA; strWIDList[u32WidsCount].ps8WidVal = pstrWFIDrv->strWILC_UsrConnReq.pu8ConnReqIEs; - strWIDList[u32WidsCount].s32ValueSize = pstrWFIDrv->strWILC_UsrConnReq.ConnReqIEsLen; + strWIDList[u32WidsCount].size = pstrWFIDrv->strWILC_UsrConnReq.ConnReqIEsLen; u32WidsCount++; if (memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7)) { @@ -1534,7 +1534,7 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler, } strWIDList[u32WidsCount].id = (u16)WID_11I_MODE; strWIDList[u32WidsCount].type = WID_CHAR; - strWIDList[u32WidsCount].s32ValueSize = sizeof(char); + strWIDList[u32WidsCount].size = sizeof(char); strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrWFIDrv->strWILC_UsrConnReq.u8security)); u32WidsCount++; @@ -1546,7 +1546,7 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler, strWIDList[u32WidsCount].id = (u16)WID_AUTH_TYPE; strWIDList[u32WidsCount].type = WID_CHAR; - strWIDList[u32WidsCount].s32ValueSize = sizeof(char); + strWIDList[u32WidsCount].size = sizeof(char); strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&pstrWFIDrv->strWILC_UsrConnReq.tenuAuth_type); u32WidsCount++; @@ -1569,11 +1569,11 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler, strWIDList[u32WidsCount].type = WID_STR; /*Sending NoA attributes during connection*/ - strWIDList[u32WidsCount].s32ValueSize = 112; /* 79; */ - strWIDList[u32WidsCount].ps8WidVal = kmalloc(strWIDList[u32WidsCount].s32ValueSize, GFP_KERNEL); + strWIDList[u32WidsCount].size = 112; /* 79; */ + strWIDList[u32WidsCount].ps8WidVal = kmalloc(strWIDList[u32WidsCount].size, GFP_KERNEL); if (memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7)) { - gu32FlushedJoinReqSize = strWIDList[u32WidsCount].s32ValueSize; + gu32FlushedJoinReqSize = strWIDList[u32WidsCount].size; gu8FlushedJoinReq = kmalloc(gu32FlushedJoinReqSize, GFP_KERNEL); } if (strWIDList[u32WidsCount].ps8WidVal == NULL) { @@ -1815,12 +1815,12 @@ static s32 Handle_FlushConnect(struct host_if_drv *drvHandler) strWIDList[u32WidsCount].id = WID_INFO_ELEMENT_ASSOCIATE; strWIDList[u32WidsCount].type = WID_BIN_DATA; strWIDList[u32WidsCount].ps8WidVal = gu8FlushedInfoElemAsoc; - strWIDList[u32WidsCount].s32ValueSize = gu32FlushedInfoElemAsocSize; + strWIDList[u32WidsCount].size = gu32FlushedInfoElemAsocSize; u32WidsCount++; strWIDList[u32WidsCount].id = (u16)WID_11I_MODE; strWIDList[u32WidsCount].type = WID_CHAR; - strWIDList[u32WidsCount].s32ValueSize = sizeof(char); + strWIDList[u32WidsCount].size = sizeof(char); strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(gu8Flushed11iMode)); u32WidsCount++; @@ -1828,13 +1828,13 @@ static s32 Handle_FlushConnect(struct host_if_drv *drvHandler) strWIDList[u32WidsCount].id = (u16)WID_AUTH_TYPE; strWIDList[u32WidsCount].type = WID_CHAR; - strWIDList[u32WidsCount].s32ValueSize = sizeof(char); + strWIDList[u32WidsCount].size = sizeof(char); strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&gu8FlushedAuthType); u32WidsCount++; strWIDList[u32WidsCount].id = (u16)WID_JOIN_REQ_EXTENDED; strWIDList[u32WidsCount].type = WID_STR; - strWIDList[u32WidsCount].s32ValueSize = gu32FlushedJoinReqSize; + strWIDList[u32WidsCount].size = gu32FlushedJoinReqSize; strWIDList[u32WidsCount].ps8WidVal = (s8 *)gu8FlushedJoinReq; pu8CurrByte = strWIDList[u32WidsCount].ps8WidVal; @@ -1920,7 +1920,7 @@ static s32 Handle_ConnectTimeout(struct host_if_drv *drvHandler) strWID.id = (u16)WID_DISCONNECT; strWID.type = WID_CHAR; strWID.ps8WidVal = (s8 *)&u16DummyReasonCode; - strWID.s32ValueSize = sizeof(char); + strWID.size = sizeof(char); PRINT_D(HOSTINF_DBG, "Sending disconnect request\n"); @@ -2426,19 +2426,19 @@ static int Handle_Key(struct host_if_drv *drvHandler, PRINT_D(GENERIC_DBG, "ID Hostint is %d\n", (pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx)); strWIDList[0].id = (u16)WID_11I_MODE; strWIDList[0].type = WID_CHAR; - strWIDList[0].s32ValueSize = sizeof(char); + strWIDList[0].size = sizeof(char); strWIDList[0].ps8WidVal = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8mode)); strWIDList[1].id = WID_AUTH_TYPE; strWIDList[1].type = WID_CHAR; - strWIDList[1].s32ValueSize = sizeof(char); + strWIDList[1].size = sizeof(char); strWIDList[1].ps8WidVal = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.tenuAuth_type)); strWIDList[2].id = (u16)WID_KEY_ID; strWIDList[2].type = WID_CHAR; strWIDList[2].ps8WidVal = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx)); - strWIDList[2].s32ValueSize = sizeof(char); + strWIDList[2].size = sizeof(char); pu8keybuf = kmalloc(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8WepKeylen, GFP_KERNEL); @@ -2457,7 +2457,7 @@ static int Handle_Key(struct host_if_drv *drvHandler, strWIDList[3].id = (u16)WID_WEP_KEY_VALUE; strWIDList[3].type = WID_STR; - strWIDList[3].s32ValueSize = pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8WepKeylen; + strWIDList[3].size = pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8WepKeylen; strWIDList[3].ps8WidVal = (s8 *)pu8keybuf; @@ -2487,7 +2487,7 @@ static int Handle_Key(struct host_if_drv *drvHandler, strWID.id = (u16)WID_ADD_WEP_KEY; strWID.type = WID_STR; strWID.ps8WidVal = (s8 *)pu8keybuf; - strWID.s32ValueSize = pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8WepKeylen + 2; + strWID.size = pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8WepKeylen + 2; s32Error = send_config_pkt(SET_CFG, &strWID, 1, get_id_from_handler(pstrWFIDrv)); @@ -2500,7 +2500,7 @@ static int Handle_Key(struct host_if_drv *drvHandler, s8idxarray[0] = (s8)pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx; strWID.ps8WidVal = s8idxarray; - strWID.s32ValueSize = 1; + strWID.size = 1; s32Error = send_config_pkt(SET_CFG, &strWID, 1, get_id_from_handler(pstrWFIDrv)); @@ -2508,7 +2508,7 @@ static int Handle_Key(struct host_if_drv *drvHandler, strWID.id = (u16)WID_KEY_ID; strWID.type = WID_CHAR; strWID.ps8WidVal = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx)); - strWID.s32ValueSize = sizeof(char); + strWID.size = sizeof(char); PRINT_D(HOSTINF_DBG, "Setting default key index\n"); @@ -2550,13 +2550,13 @@ static int Handle_Key(struct host_if_drv *drvHandler, /* pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwpaAttr.u8Ciphermode = 0X51; */ strWIDList[0].id = (u16)WID_11I_MODE; strWIDList[0].type = WID_CHAR; - strWIDList[0].s32ValueSize = sizeof(char); + strWIDList[0].size = sizeof(char); strWIDList[0].ps8WidVal = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwpaAttr.u8Ciphermode)); strWIDList[1].id = (u16)WID_ADD_RX_GTK; strWIDList[1].type = WID_STR; strWIDList[1].ps8WidVal = (s8 *)pu8keybuf; - strWIDList[1].s32ValueSize = RX_MIC_KEY_MSG_LEN; + strWIDList[1].size = RX_MIC_KEY_MSG_LEN; s32Error = send_config_pkt(SET_CFG, strWIDList, 2, get_id_from_handler(pstrWFIDrv)); @@ -2602,7 +2602,7 @@ static int Handle_Key(struct host_if_drv *drvHandler, strWID.id = (u16)WID_ADD_RX_GTK; strWID.type = WID_STR; strWID.ps8WidVal = (s8 *)pu8keybuf; - strWID.s32ValueSize = RX_MIC_KEY_MSG_LEN; + strWID.size = RX_MIC_KEY_MSG_LEN; s32Error = send_config_pkt(SET_CFG, &strWID, 1, get_id_from_handler(pstrWFIDrv)); @@ -2653,13 +2653,13 @@ _WPARxGtk_end_case_: strWIDList[0].id = (u16)WID_11I_MODE; strWIDList[0].type = WID_CHAR; - strWIDList[0].s32ValueSize = sizeof(char); + strWIDList[0].size = sizeof(char); strWIDList[0].ps8WidVal = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwpaAttr.u8Ciphermode)); strWIDList[1].id = (u16)WID_ADD_PTK; strWIDList[1].type = WID_STR; strWIDList[1].ps8WidVal = (s8 *)pu8keybuf; - strWIDList[1].s32ValueSize = PTK_KEY_MSG_LEN + 1; + strWIDList[1].size = PTK_KEY_MSG_LEN + 1; s32Error = send_config_pkt(SET_CFG, strWIDList, 2, get_id_from_handler(pstrWFIDrv)); @@ -2700,7 +2700,7 @@ _WPARxGtk_end_case_: strWID.id = (u16)WID_ADD_PTK; strWID.type = WID_STR; strWID.ps8WidVal = (s8 *)pu8keybuf; - strWID.s32ValueSize = PTK_KEY_MSG_LEN; + strWID.size = PTK_KEY_MSG_LEN; s32Error = send_config_pkt(SET_CFG, &strWID, 1, get_id_from_handler(pstrWFIDrv)); @@ -2740,7 +2740,7 @@ _WPAPtk_end_case_: strWID.id = (u16)WID_PMKID_INFO; strWID.type = WID_STR; strWID.ps8WidVal = (s8 *)pu8keybuf; - strWID.s32ValueSize = (pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFpmkidAttr.numpmkid * PMKSA_KEY_LEN) + 1; + strWID.size = (pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFpmkidAttr.numpmkid * PMKSA_KEY_LEN) + 1; s32Error = send_config_pkt(SET_CFG, &strWID, 1, get_id_from_handler(pstrWFIDrv)); @@ -2778,7 +2778,7 @@ static void Handle_Disconnect(struct host_if_drv *drvHandler) strWID.id = (u16)WID_DISCONNECT; strWID.type = WID_CHAR; strWID.ps8WidVal = (s8 *)&u16DummyReasonCode; - strWID.s32ValueSize = sizeof(char); + strWID.size = sizeof(char); @@ -2902,7 +2902,7 @@ static s32 Handle_GetChnl(struct host_if_drv *drvHandler) strWID.id = (u16)WID_CURRENT_CHANNEL; strWID.type = WID_CHAR; strWID.ps8WidVal = (s8 *)&gu8Chnl; - strWID.s32ValueSize = sizeof(char); + strWID.size = sizeof(char); PRINT_D(HOSTINF_DBG, "Getting channel value\n"); @@ -2941,7 +2941,7 @@ static void Handle_GetRssi(struct host_if_drv *drvHandler) strWID.id = (u16)WID_RSSI; strWID.type = WID_CHAR; strWID.ps8WidVal = &gs8Rssi; - strWID.s32ValueSize = sizeof(char); + strWID.size = sizeof(char); /*Sending Cfg*/ PRINT_D(HOSTINF_DBG, "Getting RSSI value\n"); @@ -2970,7 +2970,7 @@ static void Handle_GetLinkspeed(struct host_if_drv *drvHandler) strWID.id = (u16)WID_LINKSPEED; strWID.type = WID_CHAR; strWID.ps8WidVal = &gs8lnkspd; - strWID.s32ValueSize = sizeof(char); + strWID.size = sizeof(char); /*Sending Cfg*/ PRINT_D(HOSTINF_DBG, "Getting LINKSPEED value\n"); @@ -2993,31 +2993,31 @@ s32 Handle_GetStatistics(struct host_if_drv *drvHandler, tstrStatistics *pstrSta strWIDList[u32WidsCount].id = WID_LINKSPEED; strWIDList[u32WidsCount].type = WID_CHAR; - strWIDList[u32WidsCount].s32ValueSize = sizeof(char); + strWIDList[u32WidsCount].size = sizeof(char); strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrStatistics->u8LinkSpeed)); u32WidsCount++; strWIDList[u32WidsCount].id = WID_RSSI; strWIDList[u32WidsCount].type = WID_CHAR; - strWIDList[u32WidsCount].s32ValueSize = sizeof(char); + strWIDList[u32WidsCount].size = sizeof(char); strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrStatistics->s8RSSI)); u32WidsCount++; strWIDList[u32WidsCount].id = WID_SUCCESS_FRAME_COUNT; strWIDList[u32WidsCount].type = WID_INT; - strWIDList[u32WidsCount].s32ValueSize = sizeof(u32); + strWIDList[u32WidsCount].size = sizeof(u32); strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrStatistics->u32TxCount)); u32WidsCount++; strWIDList[u32WidsCount].id = WID_RECEIVED_FRAGMENT_COUNT; strWIDList[u32WidsCount].type = WID_INT; - strWIDList[u32WidsCount].s32ValueSize = sizeof(u32); + strWIDList[u32WidsCount].size = sizeof(u32); strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrStatistics->u32RxCount)); u32WidsCount++; strWIDList[u32WidsCount].id = WID_FAILED_COUNT; strWIDList[u32WidsCount].type = WID_INT; - strWIDList[u32WidsCount].s32ValueSize = sizeof(u32); + strWIDList[u32WidsCount].size = sizeof(u32); strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrStatistics->u32TxFailureCount)); u32WidsCount++; @@ -3055,8 +3055,8 @@ static s32 Handle_Get_InActiveTime(struct host_if_drv *drvHandler, strWID.id = (u16)WID_SET_STA_MAC_INACTIVE_TIME; strWID.type = WID_STR; - strWID.s32ValueSize = ETH_ALEN; - strWID.ps8WidVal = kmalloc(strWID.s32ValueSize, GFP_KERNEL); + strWID.size = ETH_ALEN; + strWID.ps8WidVal = kmalloc(strWID.size, GFP_KERNEL); stamac = strWID.ps8WidVal; @@ -3078,7 +3078,7 @@ static s32 Handle_Get_InActiveTime(struct host_if_drv *drvHandler, strWID.id = (u16)WID_GET_INACTIVE_TIME; strWID.type = WID_INT; strWID.ps8WidVal = (s8 *)&gu32InactiveTime; - strWID.s32ValueSize = sizeof(u32); + strWID.size = sizeof(u32); s32Error = send_config_pkt(GET_CFG, &strWID, 1, @@ -3122,8 +3122,8 @@ static void Handle_AddBeacon(struct host_if_drv *drvHandler, strWID.id = (u16)WID_ADD_BEACON; strWID.type = WID_BIN; - strWID.s32ValueSize = pstrSetBeaconParam->u32HeadLen + pstrSetBeaconParam->u32TailLen + 16; - strWID.ps8WidVal = kmalloc(strWID.s32ValueSize, GFP_KERNEL); + strWID.size = pstrSetBeaconParam->u32HeadLen + pstrSetBeaconParam->u32TailLen + 16; + strWID.ps8WidVal = kmalloc(strWID.size, GFP_KERNEL); if (strWID.ps8WidVal == NULL) goto ERRORHANDLER; @@ -3188,7 +3188,7 @@ static void Handle_DelBeacon(struct host_if_drv *drvHandler) strWID.id = (u16)WID_DEL_BEACON; strWID.type = WID_CHAR; - strWID.s32ValueSize = sizeof(char); + strWID.size = sizeof(char); strWID.ps8WidVal = &gu8DelBcn; if (strWID.ps8WidVal == NULL) @@ -3282,9 +3282,9 @@ static void Handle_AddStation(struct host_if_drv *drvHandler, PRINT_D(HOSTINF_DBG, "Handling add station\n"); strWID.id = (u16)WID_ADD_STA; strWID.type = WID_BIN; - strWID.s32ValueSize = WILC_ADD_STA_LENGTH + pstrStationParam->u8NumRates; + strWID.size = WILC_ADD_STA_LENGTH + pstrStationParam->u8NumRates; - strWID.ps8WidVal = kmalloc(strWID.s32ValueSize, GFP_KERNEL); + strWID.ps8WidVal = kmalloc(strWID.size, GFP_KERNEL); if (strWID.ps8WidVal == NULL) goto ERRORHANDLER; @@ -3324,7 +3324,7 @@ static void Handle_DelAllSta(struct host_if_drv *drvHandler, strWID.id = (u16)WID_DEL_ALL_STA; strWID.type = WID_STR; - strWID.s32ValueSize = (pstrDelAllStaParam->u8Num_AssocSta * ETH_ALEN) + 1; + strWID.size = (pstrDelAllStaParam->u8Num_AssocSta * ETH_ALEN) + 1; PRINT_D(HOSTINF_DBG, "Handling delete station\n"); @@ -3377,11 +3377,11 @@ static void Handle_DelStation(struct host_if_drv *drvHandler, strWID.id = (u16)WID_REMOVE_STA; strWID.type = WID_BIN; - strWID.s32ValueSize = ETH_ALEN; + strWID.size = ETH_ALEN; PRINT_D(HOSTINF_DBG, "Handling delete station\n"); - strWID.ps8WidVal = kmalloc(strWID.s32ValueSize, GFP_KERNEL); + strWID.ps8WidVal = kmalloc(strWID.size, GFP_KERNEL); if (strWID.ps8WidVal == NULL) goto ERRORHANDLER; @@ -3419,10 +3419,10 @@ static void Handle_EditStation(struct host_if_drv *drvHandler, strWID.id = (u16)WID_EDIT_STA; strWID.type = WID_BIN; - strWID.s32ValueSize = WILC_ADD_STA_LENGTH + pstrStationParam->u8NumRates; + strWID.size = WILC_ADD_STA_LENGTH + pstrStationParam->u8NumRates; PRINT_D(HOSTINF_DBG, "Handling edit station\n"); - strWID.ps8WidVal = kmalloc(strWID.s32ValueSize, GFP_KERNEL); + strWID.ps8WidVal = kmalloc(strWID.size, GFP_KERNEL); if (strWID.ps8WidVal == NULL) goto ERRORHANDLER; @@ -3492,8 +3492,8 @@ static int Handle_RemainOnChan(struct host_if_drv *drvHandler, u8remain_on_chan_flag = true; strWID.id = (u16)WID_REMAIN_ON_CHAN; strWID.type = WID_STR; - strWID.s32ValueSize = 2; - strWID.ps8WidVal = kmalloc(strWID.s32ValueSize, GFP_KERNEL); + strWID.size = 2; + strWID.ps8WidVal = kmalloc(strWID.size, GFP_KERNEL); if (strWID.ps8WidVal == NULL) { s32Error = -ENOMEM; @@ -3560,7 +3560,7 @@ static int Handle_RegisterFrame(struct host_if_drv *drvHandler, memcpy(pu8CurrByte, &(pstrHostIfRegisterFrame->u16FrameType), sizeof(u16)); - strWID.s32ValueSize = sizeof(u16) + 2; + strWID.size = sizeof(u16) + 2; /*Sending Cfg*/ @@ -3601,8 +3601,8 @@ static u32 Handle_ListenStateExpired(struct host_if_drv *drvHandler, u8remain_on_chan_flag = false; strWID.id = (u16)WID_REMAIN_ON_CHAN; strWID.type = WID_STR; - strWID.s32ValueSize = 2; - strWID.ps8WidVal = kmalloc(strWID.s32ValueSize, GFP_KERNEL); + strWID.size = 2; + strWID.ps8WidVal = kmalloc(strWID.size, GFP_KERNEL); if (strWID.ps8WidVal == NULL) PRINT_ER("Failed to allocate memory\n"); @@ -3687,7 +3687,7 @@ static void Handle_PowerManagement(struct host_if_drv *drvHandler, s8PowerMode = NO_POWERSAVE; PRINT_D(HOSTINF_DBG, "Handling power mgmt to %d\n", s8PowerMode); strWID.ps8WidVal = &s8PowerMode; - strWID.s32ValueSize = sizeof(char); + strWID.size = sizeof(char); PRINT_D(HOSTINF_DBG, "Handling Power Management\n"); @@ -3718,8 +3718,8 @@ static void Handle_SetMulticastFilter(struct host_if_drv *drvHandler, strWID.id = (u16)WID_SETUP_MULTICAST_FILTER; strWID.type = WID_BIN; - strWID.s32ValueSize = sizeof(struct set_multicast) + ((strHostIfSetMulti->u32count) * ETH_ALEN); - strWID.ps8WidVal = kmalloc(strWID.s32ValueSize, GFP_KERNEL); + strWID.size = sizeof(struct set_multicast) + ((strHostIfSetMulti->u32count) * ETH_ALEN); + strWID.ps8WidVal = kmalloc(strWID.size, GFP_KERNEL); if (strWID.ps8WidVal == NULL) goto ERRORHANDLER; @@ -3778,7 +3778,7 @@ static s32 Handle_AddBASession(struct host_if_drv *drvHandler, strWID.id = (u16)WID_11E_P_ACTION_REQ; strWID.type = WID_STR; strWID.ps8WidVal = kmalloc(BLOCK_ACK_REQ_SIZE, GFP_KERNEL); - strWID.s32ValueSize = BLOCK_ACK_REQ_SIZE; + strWID.size = BLOCK_ACK_REQ_SIZE; ptr = strWID.ps8WidVal; /* *ptr++ = 0x14; */ *ptr++ = 0x14; @@ -3811,7 +3811,7 @@ static s32 Handle_AddBASession(struct host_if_drv *drvHandler, strWID.id = (u16)WID_11E_P_ACTION_REQ; strWID.type = WID_STR; - strWID.s32ValueSize = 15; + strWID.size = 15; ptr = strWID.ps8WidVal; /* *ptr++ = 0x14; */ *ptr++ = 15; @@ -3864,7 +3864,7 @@ static s32 Handle_DelAllRxBASessions(struct host_if_drv *drvHandler, strWID.id = (u16)WID_DEL_ALL_RX_BA; strWID.type = WID_STR; strWID.ps8WidVal = kmalloc(BLOCK_ACK_REQ_SIZE, GFP_KERNEL); - strWID.s32ValueSize = BLOCK_ACK_REQ_SIZE; + strWID.size = BLOCK_ACK_REQ_SIZE; ptr = strWID.ps8WidVal; *ptr++ = 0x14; *ptr++ = 0x3; @@ -4163,7 +4163,7 @@ s32 host_int_remove_key(struct host_if_drv *hWFIDrv, const u8 *pu8StaAddress) strWID.id = (u16)WID_REMOVE_KEY; strWID.type = WID_STR; strWID.ps8WidVal = (s8 *)pu8StaAddress; - strWID.s32ValueSize = 6; + strWID.size = 6; return 0; } @@ -4684,7 +4684,7 @@ s32 host_int_get_pmkid_info(struct host_if_drv *hWFIDrv, u8 *pu8PmkidInfoArray, strWID.id = (u16)WID_PMKID_INFO; strWID.type = WID_STR; - strWID.s32ValueSize = u32PmkidInfoLen; + strWID.size = u32PmkidInfoLen; strWID.ps8WidVal = pu8PmkidInfoArray; return 0; @@ -4714,7 +4714,7 @@ s32 host_int_set_RSNAConfigPSKPassPhrase(struct host_if_drv *hWFIDrv, u8 *pu8Pas strWID.id = (u16)WID_11I_PSK; strWID.type = WID_STR; strWID.ps8WidVal = pu8PassPhrase; - strWID.s32ValueSize = u8Psklength; + strWID.size = u8Psklength; } return 0; @@ -4806,7 +4806,7 @@ s32 host_int_get_RSNAConfigPSKPassPhrase(struct host_if_drv *hWFIDrv, strWID.id = (u16)WID_11I_PSK; strWID.type = WID_STR; - strWID.s32ValueSize = u8Psklength; + strWID.size = u8Psklength; strWID.ps8WidVal = pu8PassPhrase; return 0; @@ -4834,7 +4834,7 @@ s32 host_int_set_start_scan_req(struct host_if_drv *hWFIDrv, u8 scanSource) strWID.id = (u16)WID_START_SCAN_REQ; strWID.type = WID_CHAR; strWID.ps8WidVal = (s8 *)&scanSource; - strWID.s32ValueSize = sizeof(char); + strWID.size = sizeof(char); return 0; } @@ -4862,7 +4862,7 @@ s32 host_int_get_start_scan_req(struct host_if_drv *hWFIDrv, u8 *pu8ScanSource) strWID.id = (u16)WID_START_SCAN_REQ; strWID.type = WID_CHAR; strWID.ps8WidVal = (s8 *)pu8ScanSource; - strWID.s32ValueSize = sizeof(char); + strWID.size = sizeof(char); return 0; } @@ -5059,7 +5059,7 @@ s32 host_int_disconnect_station(struct host_if_drv *hWFIDrv, u8 assoc_id) strWID.id = (u16)WID_DISCONNECT; strWID.type = WID_CHAR; strWID.ps8WidVal = (s8 *)&assoc_id; - strWID.s32ValueSize = sizeof(char); + strWID.size = sizeof(char); return 0; } @@ -5098,7 +5098,7 @@ s32 host_int_get_assoc_req_info(struct host_if_drv *hWFIDrv, u8 *pu8AssocReqInfo strWID.id = (u16)WID_ASSOC_REQ_INFO; strWID.type = WID_STR; strWID.ps8WidVal = pu8AssocReqInfo; - strWID.s32ValueSize = u32AssocReqInfoLen; + strWID.size = u32AssocReqInfoLen; return 0; } @@ -5129,7 +5129,7 @@ s32 host_int_get_assoc_res_info(struct host_if_drv *hWFIDrv, u8 *pu8AssocRespInf strWID.id = (u16)WID_ASSOC_RES_INFO; strWID.type = WID_STR; strWID.ps8WidVal = pu8AssocRespInfo; - strWID.s32ValueSize = u32MaxAssocRespInfoLen; + strWID.size = u32MaxAssocRespInfoLen; /* Sending Configuration packet */ @@ -5140,7 +5140,7 @@ s32 host_int_get_assoc_res_info(struct host_if_drv *hWFIDrv, u8 *pu8AssocRespInf PRINT_ER("Failed to send association response config packet\n"); return -EINVAL; } else { - *pu32RcvdAssocRespInfoLen = strWID.s32ValueSize; + *pu32RcvdAssocRespInfoLen = strWID.size; } return s32Error; @@ -5169,7 +5169,7 @@ s32 host_int_get_rx_power_level(struct host_if_drv *hWFIDrv, u8 *pu8RxPowerLevel strWID.id = (u16)WID_RX_POWER_LEVEL; strWID.type = WID_STR; strWID.ps8WidVal = pu8RxPowerLevel; - strWID.s32ValueSize = u32RxPowerLevelLen; + strWID.size = u32RxPowerLevelLen; return 0; } @@ -5359,7 +5359,7 @@ s32 host_int_test_set_int_wid(struct host_if_drv *hWFIDrv, u32 u32TestMemAddr) strWID.id = (u16)WID_MEMORY_ADDRESS; strWID.type = WID_INT; strWID.ps8WidVal = (char *)&u32TestMemAddr; - strWID.s32ValueSize = sizeof(u32); + strWID.size = sizeof(u32); /*Sending Cfg*/ s32Error = send_config_pkt(SET_CFG, &strWID, 1, @@ -5444,7 +5444,7 @@ s32 host_int_test_get_int_wid(struct host_if_drv *hWFIDrv, u32 *pu32TestMemAddr) strWID.id = (u16)WID_MEMORY_ADDRESS; strWID.type = WID_INT; strWID.ps8WidVal = (s8 *)pu32TestMemAddr; - strWID.s32ValueSize = sizeof(u32); + strWID.size = sizeof(u32); s32Error = send_config_pkt(GET_CFG, &strWID, 1, get_id_from_handler(pstrWFIDrv));