* [PATCH 01/10] staging: wilc1000: remove typedef from tstrWID
@ 2015-10-06 9:42 Tony Cho
2015-10-06 9:42 ` [PATCH 02/10] staging: wilc1000: remove typedef from tenuWIDtype Tony Cho
` (9 more replies)
0 siblings, 10 replies; 13+ messages in thread
From: Tony Cho @ 2015-10-06 9:42 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
From: Leo Kim <leo.kim@atmel.com>
This patch removes typedef from the struct tstrWID and
rename it to wid.
Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/coreconfigurator.c | 2 +-
drivers/staging/wilc1000/coreconfigurator.h | 7 +--
drivers/staging/wilc1000/host_interface.c | 92 ++++++++++++++---------------
3 files changed, 50 insertions(+), 51 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index 189be4a..f5913377 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -595,7 +595,7 @@ s32 DeallocateAssocRespInfo(tstrConnectRespInfo *pstrConnectRespInfo)
* @date 1 Mar 2012
* @version 1.0
*/
-s32 send_config_pkt(u8 mode, tstrWID *wids, u32 count, u32 drv)
+s32 send_config_pkt(u8 mode, struct wid *wids, u32 count, u32 drv)
{
s32 counter = 0, ret = 0;
diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h
index 8ba30dc..306efc9 100644
--- a/drivers/staging/wilc1000/coreconfigurator.h
+++ b/drivers/staging/wilc1000/coreconfigurator.h
@@ -70,13 +70,12 @@ typedef enum {
CONNECT_STS_FORCE_16_BIT = 0xFFFF
} tenuConnectSts;
-typedef struct {
+struct wid {
u16 u16WIDid;
tenuWIDtype enuWIDtype;
s32 s32ValueSize;
s8 *ps8WidVal;
-
-} tstrWID;
+};
typedef struct {
u8 u8Full;
@@ -128,7 +127,7 @@ typedef struct {
size_t ie_len;
} tstrDisconnectNotifInfo;
-s32 send_config_pkt(u8 mode, tstrWID *wids, u32 count, u32 drv);
+s32 send_config_pkt(u8 mode, struct wid *wids, u32 count, u32 drv);
s32 parse_network_info(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo);
s32 DeallocateNetworkInfo(tstrNetworkInfo *pstrNetworkInfo);
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 982bb4c..f5feef9 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -571,7 +571,7 @@ static s32 Handle_SetChannel(struct host_if_drv *drvHandler,
{
s32 s32Error = 0;
- tstrWID strWID;
+ struct wid strWID;
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
/*prepare configuration packet*/
@@ -606,7 +606,7 @@ static s32 Handle_SetWfiDrvHandler(struct host_if_drv *drvHandler,
{
s32 s32Error = 0;
- tstrWID strWID;
+ struct wid strWID;
struct host_if_drv *pstrWFIDrv = drvHandler;
@@ -647,7 +647,7 @@ static s32 Handle_SetOperationMode(struct host_if_drv *drvHandler,
{
s32 s32Error = 0;
- tstrWID strWID;
+ struct wid strWID;
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
@@ -689,7 +689,7 @@ s32 Handle_set_IPAddress(struct host_if_drv *drvHandler, u8 *pu8IPAddr, u8 idx)
{
s32 s32Error = 0;
- tstrWID strWID;
+ struct wid strWID;
char firmwareIPAddress[4] = {0};
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
@@ -736,7 +736,7 @@ s32 Handle_get_IPAddress(struct host_if_drv *drvHandler, u8 *pu8IPAddr, u8 idx)
{
s32 s32Error = 0;
- tstrWID strWID;
+ struct wid strWID;
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
/*prepare configuration packet*/
@@ -785,7 +785,7 @@ static s32 Handle_SetMacAddress(struct host_if_drv *drvHandler,
{
s32 s32Error = 0;
- tstrWID strWID;
+ struct wid strWID;
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
u8 *mac_buf = kmalloc(ETH_ALEN, GFP_KERNEL);
@@ -828,7 +828,7 @@ static s32 Handle_GetMacAddress(struct host_if_drv *drvHandler,
{
s32 s32Error = 0;
- tstrWID strWID;
+ struct wid strWID;
/*prepare configuration packet*/
strWID.u16WIDid = (u16)WID_MAC_ADDR;
@@ -862,7 +862,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
struct cfg_param_attr *strHostIFCfgParamAttr)
{
s32 s32Error = 0;
- tstrWID strWIDList[32];
+ struct wid strWIDList[32];
u8 u8WidCnt = 0;
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
@@ -1220,7 +1220,7 @@ static s32 Handle_Scan(struct host_if_drv *drvHandler,
struct scan_attr *pstrHostIFscanAttr)
{
s32 s32Error = 0;
- tstrWID strWIDList[5];
+ struct wid strWIDList[5];
u32 u32WidsCount = 0;
u32 i;
u8 *pu8Buffer;
@@ -1391,7 +1391,7 @@ static s32 Handle_ScanDone(struct host_if_drv *drvHandler, tenuScanEvent enuEven
u8 u8abort_running_scan;
- tstrWID strWID;
+ struct wid strWID;
PRINT_D(HOSTINF_DBG, "in Handle_ScanDone()\n");
@@ -1445,7 +1445,7 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler,
{
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *) drvHandler;
s32 s32Error = 0;
- tstrWID strWIDList[8];
+ struct wid strWIDList[8];
u32 u32WidsCount = 0, dummyval = 0;
/* char passphrase[] = "12345678"; */
u8 *pu8CurrByte = NULL;
@@ -1806,7 +1806,7 @@ ERRORHANDLER:
static s32 Handle_FlushConnect(struct host_if_drv *drvHandler)
{
s32 s32Error = 0;
- tstrWID strWIDList[5];
+ struct wid strWIDList[5];
u32 u32WidsCount = 0;
u8 *pu8CurrByte = NULL;
@@ -1866,7 +1866,7 @@ static s32 Handle_ConnectTimeout(struct host_if_drv *drvHandler)
{
s32 s32Error = 0;
tstrConnectInfo strConnectInfo;
- tstrWID strWID;
+ struct wid strWID;
u16 u16DummyReasonCode = 0;
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *) drvHandler;
@@ -2406,8 +2406,8 @@ static int Handle_Key(struct host_if_drv *drvHandler,
struct key_attr *pstrHostIFkeyAttr)
{
s32 s32Error = 0;
- tstrWID strWID;
- tstrWID strWIDList[5];
+ struct wid strWID;
+ struct wid strWIDList[5];
u8 i;
u8 *pu8keybuf;
s8 s8idxarray[1];
@@ -2768,7 +2768,7 @@ _WPAPtk_end_case_:
*/
static void Handle_Disconnect(struct host_if_drv *drvHandler)
{
- tstrWID strWID;
+ struct wid strWID;
s32 s32Error = 0;
u16 u16DummyReasonCode = 0;
@@ -2896,7 +2896,7 @@ static s32 Handle_GetChnl(struct host_if_drv *drvHandler)
{
s32 s32Error = 0;
- tstrWID strWID;
+ struct wid strWID;
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
strWID.u16WIDid = (u16)WID_CURRENT_CHANNEL;
@@ -2935,7 +2935,7 @@ static s32 Handle_GetChnl(struct host_if_drv *drvHandler)
static void Handle_GetRssi(struct host_if_drv *drvHandler)
{
s32 s32Error = 0;
- tstrWID strWID;
+ struct wid strWID;
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
strWID.u16WIDid = (u16)WID_RSSI;
@@ -2962,7 +2962,7 @@ static void Handle_GetRssi(struct host_if_drv *drvHandler)
static void Handle_GetLinkspeed(struct host_if_drv *drvHandler)
{
s32 s32Error = 0;
- tstrWID strWID;
+ struct wid strWID;
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
gs8lnkspd = 0;
@@ -2988,7 +2988,7 @@ static void Handle_GetLinkspeed(struct host_if_drv *drvHandler)
s32 Handle_GetStatistics(struct host_if_drv *drvHandler, tstrStatistics *pstrStatistics)
{
- tstrWID strWIDList[5];
+ struct wid strWIDList[5];
u32 u32WidsCount = 0, s32Error = 0;
strWIDList[u32WidsCount].u16WIDid = WID_LINKSPEED;
@@ -3049,7 +3049,7 @@ static s32 Handle_Get_InActiveTime(struct host_if_drv *drvHandler,
s32 s32Error = 0;
u8 *stamac;
- tstrWID strWID;
+ struct wid strWID;
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
@@ -3114,7 +3114,7 @@ static void Handle_AddBeacon(struct host_if_drv *drvHandler,
struct beacon_attr *pstrSetBeaconParam)
{
s32 s32Error = 0;
- tstrWID strWID;
+ struct wid strWID;
u8 *pu8CurrByte;
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
@@ -3182,7 +3182,7 @@ ERRORHANDLER:
static void Handle_DelBeacon(struct host_if_drv *drvHandler)
{
s32 s32Error = 0;
- tstrWID strWID;
+ struct wid strWID;
u8 *pu8CurrByte;
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
@@ -3275,7 +3275,7 @@ static void Handle_AddStation(struct host_if_drv *drvHandler,
struct add_sta_param *pstrStationParam)
{
s32 s32Error = 0;
- tstrWID strWID;
+ struct wid strWID;
u8 *pu8CurrByte;
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
@@ -3316,7 +3316,7 @@ static void Handle_DelAllSta(struct host_if_drv *drvHandler,
{
s32 s32Error = 0;
- tstrWID strWID;
+ struct wid strWID;
u8 *pu8CurrByte;
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
u8 i;
@@ -3371,7 +3371,7 @@ static void Handle_DelStation(struct host_if_drv *drvHandler,
struct del_sta *pstrDelStaParam)
{
s32 s32Error = 0;
- tstrWID strWID;
+ struct wid strWID;
u8 *pu8CurrByte;
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
@@ -3413,7 +3413,7 @@ static void Handle_EditStation(struct host_if_drv *drvHandler,
struct add_sta_param *pstrStationParam)
{
s32 s32Error = 0;
- tstrWID strWID;
+ struct wid strWID;
u8 *pu8CurrByte;
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
@@ -3454,7 +3454,7 @@ static int Handle_RemainOnChan(struct host_if_drv *drvHandler,
{
s32 s32Error = 0;
u8 u8remain_on_chan_flag;
- tstrWID strWID;
+ struct wid strWID;
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *) drvHandler;
/*If it's a pendig remain-on-channel, don't overwrite gWFiDrvHandle values (since incoming msg is garbbage)*/
@@ -3540,7 +3540,7 @@ static int Handle_RegisterFrame(struct host_if_drv *drvHandler,
struct reg_frame *pstrHostIfRegisterFrame)
{
s32 s32Error = 0;
- tstrWID strWID;
+ struct wid strWID;
u8 *pu8CurrByte;
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
@@ -3589,7 +3589,7 @@ static u32 Handle_ListenStateExpired(struct host_if_drv *drvHandler,
struct remain_ch *pstrHostIfRemainOnChan)
{
u8 u8remain_on_chan_flag;
- tstrWID strWID;
+ struct wid strWID;
s32 s32Error = 0;
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *) drvHandler;
@@ -3675,7 +3675,7 @@ static void Handle_PowerManagement(struct host_if_drv *drvHandler,
struct power_mgmt_param *strPowerMgmtParam)
{
s32 s32Error = 0;
- tstrWID strWID;
+ struct wid strWID;
s8 s8PowerMode;
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
@@ -3711,7 +3711,7 @@ static void Handle_SetMulticastFilter(struct host_if_drv *drvHandler,
struct set_multicast *strHostIfSetMulti)
{
s32 s32Error = 0;
- tstrWID strWID;
+ struct wid strWID;
u8 *pu8CurrByte;
PRINT_D(HOSTINF_DBG, "Setup Multicast Filter\n");
@@ -3762,7 +3762,7 @@ static s32 Handle_AddBASession(struct host_if_drv *drvHandler,
struct ba_session_info *strHostIfBASessionInfo)
{
s32 s32Error = 0;
- tstrWID strWID;
+ struct wid strWID;
int AddbaTimeout = 100;
char *ptr = NULL;
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
@@ -3851,7 +3851,7 @@ static s32 Handle_DelAllRxBASessions(struct host_if_drv *drvHandler,
struct ba_session_info *strHostIfBASessionInfo)
{
s32 s32Error = 0;
- tstrWID strWID;
+ struct wid strWID;
char *ptr = NULL;
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
@@ -4158,7 +4158,7 @@ static void TimerCB_Connect(unsigned long arg)
/* Check implementation in core adding 9 bytes to the input! */
s32 host_int_remove_key(struct host_if_drv *hWFIDrv, const u8 *pu8StaAddress)
{
- tstrWID strWID;
+ struct wid strWID;
strWID.u16WIDid = (u16)WID_REMOVE_KEY;
strWID.enuWIDtype = WID_STR;
@@ -4680,7 +4680,7 @@ s32 host_int_set_pmkid_info(struct host_if_drv *hWFIDrv, struct host_if_pmkid_at
s32 host_int_get_pmkid_info(struct host_if_drv *hWFIDrv, u8 *pu8PmkidInfoArray,
u32 u32PmkidInfoLen)
{
- tstrWID strWID;
+ struct wid strWID;
strWID.u16WIDid = (u16)WID_PMKID_INFO;
strWID.enuWIDtype = WID_STR;
@@ -4707,7 +4707,7 @@ s32 host_int_get_pmkid_info(struct host_if_drv *hWFIDrv, u8 *pu8PmkidInfoArray,
s32 host_int_set_RSNAConfigPSKPassPhrase(struct host_if_drv *hWFIDrv, u8 *pu8PassPhrase,
u8 u8Psklength)
{
- tstrWID strWID;
+ struct wid strWID;
/*validating psk length*/
if ((u8Psklength > 7) && (u8Psklength < 65)) {
@@ -4802,7 +4802,7 @@ s32 host_int_set_MacAddress(struct host_if_drv *hWFIDrv, u8 *pu8MacAddress)
s32 host_int_get_RSNAConfigPSKPassPhrase(struct host_if_drv *hWFIDrv,
u8 *pu8PassPhrase, u8 u8Psklength)
{
- tstrWID strWID;
+ struct wid strWID;
strWID.u16WIDid = (u16)WID_11I_PSK;
strWID.enuWIDtype = WID_STR;
@@ -4829,7 +4829,7 @@ s32 host_int_get_RSNAConfigPSKPassPhrase(struct host_if_drv *hWFIDrv,
*/
s32 host_int_set_start_scan_req(struct host_if_drv *hWFIDrv, u8 scanSource)
{
- tstrWID strWID;
+ struct wid strWID;
strWID.u16WIDid = (u16)WID_START_SCAN_REQ;
strWID.enuWIDtype = WID_CHAR;
@@ -4857,7 +4857,7 @@ s32 host_int_set_start_scan_req(struct host_if_drv *hWFIDrv, u8 scanSource)
s32 host_int_get_start_scan_req(struct host_if_drv *hWFIDrv, u8 *pu8ScanSource)
{
- tstrWID strWID;
+ struct wid strWID;
strWID.u16WIDid = (u16)WID_START_SCAN_REQ;
strWID.enuWIDtype = WID_CHAR;
@@ -5054,7 +5054,7 @@ s32 host_int_disconnect(struct host_if_drv *hWFIDrv, u16 u16ReasonCode)
*/
s32 host_int_disconnect_station(struct host_if_drv *hWFIDrv, u8 assoc_id)
{
- tstrWID strWID;
+ struct wid strWID;
strWID.u16WIDid = (u16)WID_DISCONNECT;
strWID.enuWIDtype = WID_CHAR;
@@ -5093,7 +5093,7 @@ s32 host_int_disconnect_station(struct host_if_drv *hWFIDrv, u8 assoc_id)
s32 host_int_get_assoc_req_info(struct host_if_drv *hWFIDrv, u8 *pu8AssocReqInfo,
u32 u32AssocReqInfoLen)
{
- tstrWID strWID;
+ struct wid strWID;
strWID.u16WIDid = (u16)WID_ASSOC_REQ_INFO;
strWID.enuWIDtype = WID_STR;
@@ -5118,7 +5118,7 @@ s32 host_int_get_assoc_res_info(struct host_if_drv *hWFIDrv, u8 *pu8AssocRespInf
u32 u32MaxAssocRespInfoLen, u32 *pu32RcvdAssocRespInfoLen)
{
s32 s32Error = 0;
- tstrWID strWID;
+ struct wid strWID;
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
if (pstrWFIDrv == NULL) {
@@ -5164,7 +5164,7 @@ s32 host_int_get_assoc_res_info(struct host_if_drv *hWFIDrv, u8 *pu8AssocRespInf
s32 host_int_get_rx_power_level(struct host_if_drv *hWFIDrv, u8 *pu8RxPowerLevel,
u32 u32RxPowerLevelLen)
{
- tstrWID strWID;
+ struct wid strWID;
strWID.u16WIDid = (u16)WID_RX_POWER_LEVEL;
strWID.enuWIDtype = WID_STR;
@@ -5346,7 +5346,7 @@ s32 host_int_get_host_chnl_num(struct host_if_drv *hWFIDrv, u8 *pu8ChNo)
s32 host_int_test_set_int_wid(struct host_if_drv *hWFIDrv, u32 u32TestMemAddr)
{
s32 s32Error = 0;
- tstrWID strWID;
+ struct wid strWID;
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
@@ -5432,7 +5432,7 @@ s32 host_int_test_get_int_wid(struct host_if_drv *hWFIDrv, u32 *pu32TestMemAddr)
{
s32 s32Error = 0;
- tstrWID strWID;
+ struct wid strWID;
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)hWFIDrv;
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 02/10] staging: wilc1000: remove typedef from tenuWIDtype
2015-10-06 9:42 [PATCH 01/10] staging: wilc1000: remove typedef from tstrWID Tony Cho
@ 2015-10-06 9:42 ` Tony Cho
2015-10-06 15:14 ` Mike Rapoport
2015-10-06 9:42 ` [PATCH 03/10] staging: wilc1000: rename the member variable, enuWIDtype of wid Tony Cho
` (8 subsequent siblings)
9 siblings, 1 reply; 13+ messages in thread
From: Tony Cho @ 2015-10-06 9:42 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
From: Leo Kim <leo.kim@atmel.com>
This patch remove typedef from the enum tenuWIDtype
and rename it to WID_TYPE.
Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/coreconfigurator.h | 2 +-
drivers/staging/wilc1000/host_interface.h | 2 +-
drivers/staging/wilc1000/wilc_wlan_if.h | 5 ++---
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h
index 306efc9..02faf58 100644
--- a/drivers/staging/wilc1000/coreconfigurator.h
+++ b/drivers/staging/wilc1000/coreconfigurator.h
@@ -72,7 +72,7 @@ typedef enum {
struct wid {
u16 u16WIDid;
- tenuWIDtype enuWIDtype;
+ enum WID_TYPE enuWIDtype;
s32 s32ValueSize;
s8 *ps8WidVal;
};
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 1848f53..2ca6a6e 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -59,7 +59,7 @@
typedef struct {
u16 cfg_wid;
- WID_TYPE_T cfg_type;
+ enum WID_TYPE cfg_type;
s8 *pu8Para;
} cfg_param_t;
diff --git a/drivers/staging/wilc1000/wilc_wlan_if.h b/drivers/staging/wilc1000/wilc_wlan_if.h
index 8fec64d..be972af 100644
--- a/drivers/staging/wilc1000/wilc_wlan_if.h
+++ b/drivers/staging/wilc1000/wilc_wlan_if.h
@@ -315,7 +315,7 @@ typedef enum {
SW_TRIGGER_ABORT,
} TX_ABORT_OPTION_T;
-typedef enum {
+enum WID_TYPE {
WID_CHAR = 0,
WID_SHORT = 1,
WID_INT = 2,
@@ -326,8 +326,7 @@ typedef enum {
WID_ADR = 7,
WID_UNDEF = 8,
WID_TYPE_FORCE_32BIT = 0xFFFFFFFF
-
-} WID_TYPE_T, tenuWIDtype;
+};
typedef enum {
WID_NIL = 0xffff,
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 03/10] staging: wilc1000: rename the member variable, enuWIDtype of wid
2015-10-06 9:42 [PATCH 01/10] staging: wilc1000: remove typedef from tstrWID Tony Cho
2015-10-06 9:42 ` [PATCH 02/10] staging: wilc1000: remove typedef from tenuWIDtype Tony Cho
@ 2015-10-06 9:42 ` Tony Cho
2015-10-06 9:42 ` [PATCH 04/10] staging: wilc1000: rename the member variable, u16WIDid " Tony Cho
` (7 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Tony Cho @ 2015-10-06 9:42 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
From: Leo Kim <leo.kim@atmel.com>
This patch renames enuWIDtype of struct wid to type.
Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/coreconfigurator.h | 2 +-
drivers/staging/wilc1000/host_interface.c | 186 ++++++++++++++--------------
2 files changed, 94 insertions(+), 94 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h
index 02faf58..27c1a86 100644
--- a/drivers/staging/wilc1000/coreconfigurator.h
+++ b/drivers/staging/wilc1000/coreconfigurator.h
@@ -72,7 +72,7 @@ typedef enum {
struct wid {
u16 u16WIDid;
- enum WID_TYPE enuWIDtype;
+ enum WID_TYPE type;
s32 s32ValueSize;
s8 *ps8WidVal;
};
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index f5feef9..e9fe950 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -576,7 +576,7 @@ static s32 Handle_SetChannel(struct host_if_drv *drvHandler,
/*prepare configuration packet*/
strWID.u16WIDid = (u16)WID_CURRENT_CHANNEL;
- strWID.enuWIDtype = WID_CHAR;
+ strWID.type = WID_CHAR;
strWID.ps8WidVal = (char *)&(pstrHostIFSetChan->u8SetChan);
strWID.s32ValueSize = sizeof(char);
@@ -612,7 +612,7 @@ static s32 Handle_SetWfiDrvHandler(struct host_if_drv *drvHandler,
/*prepare configuration packet*/
strWID.u16WIDid = (u16)WID_SET_DRV_HANDLER;
- strWID.enuWIDtype = WID_INT;
+ strWID.type = WID_INT;
strWID.ps8WidVal = (s8 *)&(pstrHostIfSetDrvHandler->u32Address);
strWID.s32ValueSize = sizeof(u32);
@@ -653,7 +653,7 @@ static s32 Handle_SetOperationMode(struct host_if_drv *drvHandler,
/*prepare configuration packet*/
strWID.u16WIDid = (u16)WID_SET_OPERATION_MODE;
- strWID.enuWIDtype = WID_INT;
+ strWID.type = WID_INT;
strWID.ps8WidVal = (s8 *)&(pstrHostIfSetOperationMode->u32Mode);
strWID.s32ValueSize = sizeof(u32);
@@ -702,7 +702,7 @@ s32 Handle_set_IPAddress(struct host_if_drv *drvHandler, u8 *pu8IPAddr, u8 idx)
/*prepare configuration packet*/
strWID.u16WIDid = (u16)WID_IP_ADDRESS;
- strWID.enuWIDtype = WID_STR;
+ strWID.type = WID_STR;
strWID.ps8WidVal = (u8 *)pu8IPAddr;
strWID.s32ValueSize = IP_ALEN;
@@ -741,7 +741,7 @@ s32 Handle_get_IPAddress(struct host_if_drv *drvHandler, u8 *pu8IPAddr, u8 idx)
/*prepare configuration packet*/
strWID.u16WIDid = (u16)WID_IP_ADDRESS;
- strWID.enuWIDtype = WID_STR;
+ strWID.type = WID_STR;
strWID.ps8WidVal = kmalloc(IP_ALEN, GFP_KERNEL);
strWID.s32ValueSize = IP_ALEN;
@@ -797,7 +797,7 @@ static s32 Handle_SetMacAddress(struct host_if_drv *drvHandler,
/*prepare configuration packet*/
strWID.u16WIDid = (u16)WID_MAC_ADDR;
- strWID.enuWIDtype = WID_STR;
+ strWID.type = WID_STR;
strWID.ps8WidVal = mac_buf;
strWID.s32ValueSize = ETH_ALEN;
PRINT_D(GENERIC_DBG, "mac addr = :%pM\n", strWID.ps8WidVal);
@@ -832,7 +832,7 @@ static s32 Handle_GetMacAddress(struct host_if_drv *drvHandler,
/*prepare configuration packet*/
strWID.u16WIDid = (u16)WID_MAC_ADDR;
- strWID.enuWIDtype = WID_STR;
+ strWID.type = WID_STR;
strWID.ps8WidVal = pstrHostIfGetMacAddress->u8MacAddress;
strWID.s32ValueSize = ETH_ALEN;
@@ -882,7 +882,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.bss_type < 6) {
strWIDList[u8WidCnt].u16WIDid = WID_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);
pstrWFIDrv->strCfgValues.bss_type = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.bss_type;
} else {
@@ -902,7 +902,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) {
strWIDList[u8WidCnt].u16WIDid = WID_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);
pstrWFIDrv->strCfgValues.auth_type = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.auth_type;
} else {
@@ -917,7 +917,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.auth_timeout > 0 && strHostIFCfgParamAttr->pstrCfgParamVal.auth_timeout < 65536) {
strWIDList[u8WidCnt].u16WIDid = WID_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);
pstrWFIDrv->strCfgValues.auth_timeout = strHostIFCfgParamAttr->pstrCfgParamVal.auth_timeout;
} else {
@@ -938,7 +938,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.power_mgmt_mode < 5) {
strWIDList[u8WidCnt].u16WIDid = WID_POWER_MANAGEMENT;
strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.power_mgmt_mode;
- strWIDList[u8WidCnt].enuWIDtype = WID_CHAR;
+ strWIDList[u8WidCnt].type = WID_CHAR;
strWIDList[u8WidCnt].s32ValueSize = sizeof(char);
pstrWFIDrv->strCfgValues.power_mgmt_mode = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.power_mgmt_mode;
} else {
@@ -953,7 +953,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if ((strHostIFCfgParamAttr->pstrCfgParamVal.short_retry_limit > 0) && (strHostIFCfgParamAttr->pstrCfgParamVal.short_retry_limit < 256)) {
strWIDList[u8WidCnt].u16WIDid = WID_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);
pstrWFIDrv->strCfgValues.short_retry_limit = strHostIFCfgParamAttr->pstrCfgParamVal.short_retry_limit;
} else {
@@ -969,7 +969,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
strWIDList[u8WidCnt].u16WIDid = WID_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);
pstrWFIDrv->strCfgValues.long_retry_limit = strHostIFCfgParamAttr->pstrCfgParamVal.long_retry_limit;
} else {
@@ -984,7 +984,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.frag_threshold > 255 && strHostIFCfgParamAttr->pstrCfgParamVal.frag_threshold < 7937) {
strWIDList[u8WidCnt].u16WIDid = WID_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);
pstrWFIDrv->strCfgValues.frag_threshold = strHostIFCfgParamAttr->pstrCfgParamVal.frag_threshold;
} else {
@@ -999,7 +999,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.rts_threshold > 255 && strHostIFCfgParamAttr->pstrCfgParamVal.rts_threshold < 65536) {
strWIDList[u8WidCnt].u16WIDid = WID_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);
pstrWFIDrv->strCfgValues.rts_threshold = strHostIFCfgParamAttr->pstrCfgParamVal.rts_threshold;
} else {
@@ -1018,7 +1018,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.preamble_type < 3) {
strWIDList[u8WidCnt].u16WIDid = WID_PREAMBLE;
strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.preamble_type;
- strWIDList[u8WidCnt].enuWIDtype = WID_CHAR;
+ strWIDList[u8WidCnt].type = WID_CHAR;
strWIDList[u8WidCnt].s32ValueSize = sizeof(char);
pstrWFIDrv->strCfgValues.preamble_type = strHostIFCfgParamAttr->pstrCfgParamVal.preamble_type;
} else {
@@ -1032,7 +1032,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.short_slot_allowed < 2) {
strWIDList[u8WidCnt].u16WIDid = WID_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);
pstrWFIDrv->strCfgValues.short_slot_allowed = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.short_slot_allowed;
} else {
@@ -1050,7 +1050,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.txop_prot_disabled < 2) {
strWIDList[u8WidCnt].u16WIDid = WID_11N_TXOP_PROT_DISABLE;
strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.txop_prot_disabled;
- strWIDList[u8WidCnt].enuWIDtype = WID_CHAR;
+ strWIDList[u8WidCnt].type = WID_CHAR;
strWIDList[u8WidCnt].s32ValueSize = sizeof(char);
pstrWFIDrv->strCfgValues.txop_prot_disabled = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.txop_prot_disabled;
} else {
@@ -1065,7 +1065,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.beacon_interval > 0 && strHostIFCfgParamAttr->pstrCfgParamVal.beacon_interval < 65536) {
strWIDList[u8WidCnt].u16WIDid = WID_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);
pstrWFIDrv->strCfgValues.beacon_interval = strHostIFCfgParamAttr->pstrCfgParamVal.beacon_interval;
} else {
@@ -1080,7 +1080,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.dtim_period > 0 && strHostIFCfgParamAttr->pstrCfgParamVal.dtim_period < 256) {
strWIDList[u8WidCnt].u16WIDid = WID_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);
pstrWFIDrv->strCfgValues.dtim_period = strHostIFCfgParamAttr->pstrCfgParamVal.dtim_period;
} else {
@@ -1099,7 +1099,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.site_survey_enabled < 3) {
strWIDList[u8WidCnt].u16WIDid = WID_SITE_SURVEY;
strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.site_survey_enabled;
- strWIDList[u8WidCnt].enuWIDtype = WID_CHAR;
+ strWIDList[u8WidCnt].type = WID_CHAR;
strWIDList[u8WidCnt].s32ValueSize = sizeof(char);
pstrWFIDrv->strCfgValues.site_survey_enabled = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.site_survey_enabled;
} else {
@@ -1114,7 +1114,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) {
strWIDList[u8WidCnt].u16WIDid = WID_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);
pstrWFIDrv->strCfgValues.site_survey_scan_time = strHostIFCfgParamAttr->pstrCfgParamVal.site_survey_scan_time;
} else {
@@ -1129,7 +1129,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.active_scan_time > 0 && strHostIFCfgParamAttr->pstrCfgParamVal.active_scan_time < 65536) {
strWIDList[u8WidCnt].u16WIDid = WID_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);
pstrWFIDrv->strCfgValues.active_scan_time = strHostIFCfgParamAttr->pstrCfgParamVal.active_scan_time;
} else {
@@ -1144,7 +1144,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.passive_scan_time > 0 && strHostIFCfgParamAttr->pstrCfgParamVal.passive_scan_time < 65536) {
strWIDList[u8WidCnt].u16WIDid = WID_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);
pstrWFIDrv->strCfgValues.passive_scan_time = strHostIFCfgParamAttr->pstrCfgParamVal.passive_scan_time;
} else {
@@ -1169,7 +1169,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) {
strWIDList[u8WidCnt].u16WIDid = WID_CURRENT_TX_RATE;
strWIDList[u8WidCnt].ps8WidVal = (s8 *)&curr_tx_rate;
- strWIDList[u8WidCnt].enuWIDtype = WID_SHORT;
+ strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].s32ValueSize = sizeof(u16);
pstrWFIDrv->strCfgValues.curr_tx_rate = (u8)curr_tx_rate;
} else {
@@ -1255,7 +1255,7 @@ static s32 Handle_Scan(struct host_if_drv *drvHandler,
pstrWFIDrv->strWILC_UsrScanReq.u32RcvdChCount = 0;
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++)
valuesize += ((pstrHostIFscanAttr->strHiddenNetwork.pstrHiddenNetworkInfo[i].u8ssidlen) + 1);
@@ -1286,7 +1286,7 @@ static s32 Handle_Scan(struct host_if_drv *drvHandler,
{
/* IEs to be inserted in Probe Request */
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].s32ValueSize = pstrHostIFscanAttr->IEsLen;
u32WidsCount++;
@@ -1294,14 +1294,14 @@ static s32 Handle_Scan(struct host_if_drv *drvHandler,
/*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].ps8WidVal = (s8 *)(&(pstrHostIFscanAttr->u8ScanType));
u32WidsCount++;
/*list of channels to be scanned*/
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) {
int i;
@@ -1318,7 +1318,7 @@ static s32 Handle_Scan(struct host_if_drv *drvHandler,
/*Scan Request*/
strWIDList[u32WidsCount].u16WIDid = WID_START_SCAN_REQ;
- strWIDList[u32WidsCount].enuWIDtype = WID_CHAR;
+ strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].s32ValueSize = sizeof(char);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrHostIFscanAttr->u8ScanSource));
u32WidsCount++;
@@ -1401,7 +1401,7 @@ static s32 Handle_ScanDone(struct host_if_drv *drvHandler, tenuScanEvent enuEven
PRINT_D(GENERIC_DBG, "Abort running scan\n");
u8abort_running_scan = 1;
strWID.u16WIDid = (u16)WID_ABORT_RUNNING_SCAN;
- strWID.enuWIDtype = WID_CHAR;
+ strWID.type = WID_CHAR;
strWID.ps8WidVal = (s8 *)&u8abort_running_scan;
strWID.s32ValueSize = sizeof(char);
@@ -1497,19 +1497,19 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler,
pstrWFIDrv->strWILC_UsrConnReq.u32UserConnectPvoid = pstrHostIFconnectAttr->pvUserArg;
strWIDList[u32WidsCount].u16WIDid = WID_SUCCESS_FRAME_COUNT;
- strWIDList[u32WidsCount].enuWIDtype = WID_INT;
+ strWIDList[u32WidsCount].type = WID_INT;
strWIDList[u32WidsCount].s32ValueSize = sizeof(u32);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(dummyval));
u32WidsCount++;
strWIDList[u32WidsCount].u16WIDid = WID_RECEIVED_FRAGMENT_COUNT;
- strWIDList[u32WidsCount].enuWIDtype = WID_INT;
+ strWIDList[u32WidsCount].type = WID_INT;
strWIDList[u32WidsCount].s32ValueSize = sizeof(u32);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(dummyval));
u32WidsCount++;
strWIDList[u32WidsCount].u16WIDid = WID_FAILED_COUNT;
- strWIDList[u32WidsCount].enuWIDtype = WID_INT;
+ strWIDList[u32WidsCount].type = WID_INT;
strWIDList[u32WidsCount].s32ValueSize = sizeof(u32);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(dummyval));
u32WidsCount++;
@@ -1519,7 +1519,7 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler,
{
/* IEs to be inserted in Association Request */
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].s32ValueSize = pstrWFIDrv->strWILC_UsrConnReq.ConnReqIEsLen;
u32WidsCount++;
@@ -1533,7 +1533,7 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler,
}
}
strWIDList[u32WidsCount].u16WIDid = (u16)WID_11I_MODE;
- strWIDList[u32WidsCount].enuWIDtype = WID_CHAR;
+ strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].s32ValueSize = sizeof(char);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrWFIDrv->strWILC_UsrConnReq.u8security));
u32WidsCount++;
@@ -1545,7 +1545,7 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler,
strWIDList[u32WidsCount].u16WIDid = (u16)WID_AUTH_TYPE;
- strWIDList[u32WidsCount].enuWIDtype = WID_CHAR;
+ strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].s32ValueSize = sizeof(char);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&pstrWFIDrv->strWILC_UsrConnReq.tenuAuth_type);
u32WidsCount++;
@@ -1566,7 +1566,7 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler,
pstrWFIDrv->strWILC_UsrConnReq.pu8ssid, pstrHostIFconnectAttr->u8channel);
strWIDList[u32WidsCount].u16WIDid = (u16)WID_JOIN_REQ_EXTENDED;
- strWIDList[u32WidsCount].enuWIDtype = WID_STR;
+ strWIDList[u32WidsCount].type = WID_STR;
/*Sending NoA attributes during connection*/
strWIDList[u32WidsCount].s32ValueSize = 112; /* 79; */
@@ -1813,13 +1813,13 @@ static s32 Handle_FlushConnect(struct host_if_drv *drvHandler)
/* IEs to be inserted in Association Request */
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].s32ValueSize = gu32FlushedInfoElemAsocSize;
u32WidsCount++;
strWIDList[u32WidsCount].u16WIDid = (u16)WID_11I_MODE;
- strWIDList[u32WidsCount].enuWIDtype = WID_CHAR;
+ strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].s32ValueSize = sizeof(char);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(gu8Flushed11iMode));
u32WidsCount++;
@@ -1827,13 +1827,13 @@ static s32 Handle_FlushConnect(struct host_if_drv *drvHandler)
strWIDList[u32WidsCount].u16WIDid = (u16)WID_AUTH_TYPE;
- strWIDList[u32WidsCount].enuWIDtype = WID_CHAR;
+ strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].s32ValueSize = sizeof(char);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&gu8FlushedAuthType);
u32WidsCount++;
strWIDList[u32WidsCount].u16WIDid = (u16)WID_JOIN_REQ_EXTENDED;
- strWIDList[u32WidsCount].enuWIDtype = WID_STR;
+ strWIDList[u32WidsCount].type = WID_STR;
strWIDList[u32WidsCount].s32ValueSize = gu32FlushedJoinReqSize;
strWIDList[u32WidsCount].ps8WidVal = (s8 *)gu8FlushedJoinReq;
pu8CurrByte = strWIDList[u32WidsCount].ps8WidVal;
@@ -1918,7 +1918,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
* WID_DISCONNECT} */
strWID.u16WIDid = (u16)WID_DISCONNECT;
- strWID.enuWIDtype = WID_CHAR;
+ strWID.type = WID_CHAR;
strWID.ps8WidVal = (s8 *)&u16DummyReasonCode;
strWID.s32ValueSize = sizeof(char);
@@ -2425,17 +2425,17 @@ static int Handle_Key(struct host_if_drv *drvHandler,
PRINT_D(HOSTINF_DBG, "Handling WEP key\n");
PRINT_D(GENERIC_DBG, "ID Hostint is %d\n", (pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx));
strWIDList[0].u16WIDid = (u16)WID_11I_MODE;
- strWIDList[0].enuWIDtype = WID_CHAR;
+ strWIDList[0].type = WID_CHAR;
strWIDList[0].s32ValueSize = sizeof(char);
strWIDList[0].ps8WidVal = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8mode));
strWIDList[1].u16WIDid = WID_AUTH_TYPE;
- strWIDList[1].enuWIDtype = WID_CHAR;
+ strWIDList[1].type = WID_CHAR;
strWIDList[1].s32ValueSize = sizeof(char);
strWIDList[1].ps8WidVal = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.tenuAuth_type));
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].s32ValueSize = sizeof(char);
@@ -2456,7 +2456,7 @@ static int Handle_Key(struct host_if_drv *drvHandler,
kfree(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.pu8WepKey);
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].ps8WidVal = (s8 *)pu8keybuf;
@@ -2485,7 +2485,7 @@ static int Handle_Key(struct host_if_drv *drvHandler,
kfree(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.pu8WepKey);
strWID.u16WIDid = (u16)WID_ADD_WEP_KEY;
- strWID.enuWIDtype = WID_STR;
+ strWID.type = WID_STR;
strWID.ps8WidVal = (s8 *)pu8keybuf;
strWID.s32ValueSize = pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8WepKeylen + 2;
@@ -2496,7 +2496,7 @@ static int Handle_Key(struct host_if_drv *drvHandler,
PRINT_D(HOSTINF_DBG, "Removing key\n");
strWID.u16WIDid = (u16)WID_REMOVE_WEP_KEY;
- strWID.enuWIDtype = WID_STR;
+ strWID.type = WID_STR;
s8idxarray[0] = (s8)pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx;
strWID.ps8WidVal = s8idxarray;
@@ -2506,7 +2506,7 @@ static int Handle_Key(struct host_if_drv *drvHandler,
get_id_from_handler(pstrWFIDrv));
} else {
strWID.u16WIDid = (u16)WID_KEY_ID;
- strWID.enuWIDtype = WID_CHAR;
+ strWID.type = WID_CHAR;
strWID.ps8WidVal = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx));
strWID.s32ValueSize = sizeof(char);
@@ -2549,12 +2549,12 @@ static int Handle_Key(struct host_if_drv *drvHandler,
pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwpaAttr.u8Keylen);
/* pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwpaAttr.u8Ciphermode = 0X51; */
strWIDList[0].u16WIDid = (u16)WID_11I_MODE;
- strWIDList[0].enuWIDtype = WID_CHAR;
+ strWIDList[0].type = WID_CHAR;
strWIDList[0].s32ValueSize = sizeof(char);
strWIDList[0].ps8WidVal = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwpaAttr.u8Ciphermode));
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].s32ValueSize = RX_MIC_KEY_MSG_LEN;
@@ -2600,7 +2600,7 @@ static int Handle_Key(struct host_if_drv *drvHandler,
pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwpaAttr.u8Keylen);
strWID.u16WIDid = (u16)WID_ADD_RX_GTK;
- strWID.enuWIDtype = WID_STR;
+ strWID.type = WID_STR;
strWID.ps8WidVal = (s8 *)pu8keybuf;
strWID.s32ValueSize = RX_MIC_KEY_MSG_LEN;
@@ -2652,12 +2652,12 @@ _WPARxGtk_end_case_:
strWIDList[0].u16WIDid = (u16)WID_11I_MODE;
- strWIDList[0].enuWIDtype = WID_CHAR;
+ strWIDList[0].type = WID_CHAR;
strWIDList[0].s32ValueSize = sizeof(char);
strWIDList[0].ps8WidVal = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwpaAttr.u8Ciphermode));
strWIDList[1].u16WIDid = (u16)WID_ADD_PTK;
- strWIDList[1].enuWIDtype = WID_STR;
+ strWIDList[1].type = WID_STR;
strWIDList[1].ps8WidVal = (s8 *)pu8keybuf;
strWIDList[1].s32ValueSize = PTK_KEY_MSG_LEN + 1;
@@ -2698,7 +2698,7 @@ _WPARxGtk_end_case_:
strWID.u16WIDid = (u16)WID_ADD_PTK;
- strWID.enuWIDtype = WID_STR;
+ strWID.type = WID_STR;
strWID.ps8WidVal = (s8 *)pu8keybuf;
strWID.s32ValueSize = PTK_KEY_MSG_LEN;
@@ -2738,7 +2738,7 @@ _WPAPtk_end_case_:
}
strWID.u16WIDid = (u16)WID_PMKID_INFO;
- strWID.enuWIDtype = WID_STR;
+ strWID.type = WID_STR;
strWID.ps8WidVal = (s8 *)pu8keybuf;
strWID.s32ValueSize = (pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFpmkidAttr.numpmkid * PMKSA_KEY_LEN) + 1;
@@ -2776,7 +2776,7 @@ static void Handle_Disconnect(struct host_if_drv *drvHandler)
strWID.u16WIDid = (u16)WID_DISCONNECT;
- strWID.enuWIDtype = WID_CHAR;
+ strWID.type = WID_CHAR;
strWID.ps8WidVal = (s8 *)&u16DummyReasonCode;
strWID.s32ValueSize = sizeof(char);
@@ -2900,7 +2900,7 @@ static s32 Handle_GetChnl(struct host_if_drv *drvHandler)
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
strWID.u16WIDid = (u16)WID_CURRENT_CHANNEL;
- strWID.enuWIDtype = WID_CHAR;
+ strWID.type = WID_CHAR;
strWID.ps8WidVal = (s8 *)&gu8Chnl;
strWID.s32ValueSize = sizeof(char);
@@ -2939,7 +2939,7 @@ static void Handle_GetRssi(struct host_if_drv *drvHandler)
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
strWID.u16WIDid = (u16)WID_RSSI;
- strWID.enuWIDtype = WID_CHAR;
+ strWID.type = WID_CHAR;
strWID.ps8WidVal = &gs8Rssi;
strWID.s32ValueSize = sizeof(char);
@@ -2968,7 +2968,7 @@ static void Handle_GetLinkspeed(struct host_if_drv *drvHandler)
gs8lnkspd = 0;
strWID.u16WIDid = (u16)WID_LINKSPEED;
- strWID.enuWIDtype = WID_CHAR;
+ strWID.type = WID_CHAR;
strWID.ps8WidVal = &gs8lnkspd;
strWID.s32ValueSize = sizeof(char);
/*Sending Cfg*/
@@ -2992,31 +2992,31 @@ s32 Handle_GetStatistics(struct host_if_drv *drvHandler, tstrStatistics *pstrSta
u32 u32WidsCount = 0, s32Error = 0;
strWIDList[u32WidsCount].u16WIDid = WID_LINKSPEED;
- strWIDList[u32WidsCount].enuWIDtype = WID_CHAR;
+ strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].s32ValueSize = sizeof(char);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrStatistics->u8LinkSpeed));
u32WidsCount++;
strWIDList[u32WidsCount].u16WIDid = WID_RSSI;
- strWIDList[u32WidsCount].enuWIDtype = WID_CHAR;
+ strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].s32ValueSize = sizeof(char);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrStatistics->s8RSSI));
u32WidsCount++;
strWIDList[u32WidsCount].u16WIDid = WID_SUCCESS_FRAME_COUNT;
- strWIDList[u32WidsCount].enuWIDtype = WID_INT;
+ strWIDList[u32WidsCount].type = WID_INT;
strWIDList[u32WidsCount].s32ValueSize = sizeof(u32);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrStatistics->u32TxCount));
u32WidsCount++;
strWIDList[u32WidsCount].u16WIDid = WID_RECEIVED_FRAGMENT_COUNT;
- strWIDList[u32WidsCount].enuWIDtype = WID_INT;
+ strWIDList[u32WidsCount].type = WID_INT;
strWIDList[u32WidsCount].s32ValueSize = sizeof(u32);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrStatistics->u32RxCount));
u32WidsCount++;
strWIDList[u32WidsCount].u16WIDid = WID_FAILED_COUNT;
- strWIDList[u32WidsCount].enuWIDtype = WID_INT;
+ strWIDList[u32WidsCount].type = WID_INT;
strWIDList[u32WidsCount].s32ValueSize = sizeof(u32);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrStatistics->u32TxFailureCount));
u32WidsCount++;
@@ -3054,7 +3054,7 @@ static s32 Handle_Get_InActiveTime(struct host_if_drv *drvHandler,
strWID.u16WIDid = (u16)WID_SET_STA_MAC_INACTIVE_TIME;
- strWID.enuWIDtype = WID_STR;
+ strWID.type = WID_STR;
strWID.s32ValueSize = ETH_ALEN;
strWID.ps8WidVal = kmalloc(strWID.s32ValueSize, GFP_KERNEL);
@@ -3076,7 +3076,7 @@ static s32 Handle_Get_InActiveTime(struct host_if_drv *drvHandler,
strWID.u16WIDid = (u16)WID_GET_INACTIVE_TIME;
- strWID.enuWIDtype = WID_INT;
+ strWID.type = WID_INT;
strWID.ps8WidVal = (s8 *)&gu32InactiveTime;
strWID.s32ValueSize = sizeof(u32);
@@ -3121,7 +3121,7 @@ static void Handle_AddBeacon(struct host_if_drv *drvHandler,
PRINT_D(HOSTINF_DBG, "Adding BEACON\n");
strWID.u16WIDid = (u16)WID_ADD_BEACON;
- strWID.enuWIDtype = WID_BIN;
+ strWID.type = WID_BIN;
strWID.s32ValueSize = pstrSetBeaconParam->u32HeadLen + pstrSetBeaconParam->u32TailLen + 16;
strWID.ps8WidVal = kmalloc(strWID.s32ValueSize, GFP_KERNEL);
if (strWID.ps8WidVal == NULL)
@@ -3187,7 +3187,7 @@ static void Handle_DelBeacon(struct host_if_drv *drvHandler)
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
strWID.u16WIDid = (u16)WID_DEL_BEACON;
- strWID.enuWIDtype = WID_CHAR;
+ strWID.type = WID_CHAR;
strWID.s32ValueSize = sizeof(char);
strWID.ps8WidVal = &gu8DelBcn;
@@ -3281,7 +3281,7 @@ static void Handle_AddStation(struct host_if_drv *drvHandler,
PRINT_D(HOSTINF_DBG, "Handling add station\n");
strWID.u16WIDid = (u16)WID_ADD_STA;
- strWID.enuWIDtype = WID_BIN;
+ strWID.type = WID_BIN;
strWID.s32ValueSize = WILC_ADD_STA_LENGTH + pstrStationParam->u8NumRates;
strWID.ps8WidVal = kmalloc(strWID.s32ValueSize, GFP_KERNEL);
@@ -3323,7 +3323,7 @@ static void Handle_DelAllSta(struct host_if_drv *drvHandler,
u8 au8Zero_Buff[6] = {0};
strWID.u16WIDid = (u16)WID_DEL_ALL_STA;
- strWID.enuWIDtype = WID_STR;
+ strWID.type = WID_STR;
strWID.s32ValueSize = (pstrDelAllStaParam->u8Num_AssocSta * ETH_ALEN) + 1;
PRINT_D(HOSTINF_DBG, "Handling delete station\n");
@@ -3376,7 +3376,7 @@ static void Handle_DelStation(struct host_if_drv *drvHandler,
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
strWID.u16WIDid = (u16)WID_REMOVE_STA;
- strWID.enuWIDtype = WID_BIN;
+ strWID.type = WID_BIN;
strWID.s32ValueSize = ETH_ALEN;
PRINT_D(HOSTINF_DBG, "Handling delete station\n");
@@ -3418,7 +3418,7 @@ static void Handle_EditStation(struct host_if_drv *drvHandler,
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
strWID.u16WIDid = (u16)WID_EDIT_STA;
- strWID.enuWIDtype = WID_BIN;
+ strWID.type = WID_BIN;
strWID.s32ValueSize = WILC_ADD_STA_LENGTH + pstrStationParam->u8NumRates;
PRINT_D(HOSTINF_DBG, "Handling edit station\n");
@@ -3491,7 +3491,7 @@ static int Handle_RemainOnChan(struct host_if_drv *drvHandler,
u8remain_on_chan_flag = true;
strWID.u16WIDid = (u16)WID_REMAIN_ON_CHAN;
- strWID.enuWIDtype = WID_STR;
+ strWID.type = WID_STR;
strWID.s32ValueSize = 2;
strWID.ps8WidVal = kmalloc(strWID.s32ValueSize, GFP_KERNEL);
@@ -3548,7 +3548,7 @@ static int Handle_RegisterFrame(struct host_if_drv *drvHandler,
/*prepare configuration packet*/
strWID.u16WIDid = (u16)WID_REGISTER_FRAME;
- strWID.enuWIDtype = WID_STR;
+ strWID.type = WID_STR;
strWID.ps8WidVal = kmalloc(sizeof(u16) + 2, GFP_KERNEL);
if (strWID.ps8WidVal == NULL)
return -ENOMEM;
@@ -3600,7 +3600,7 @@ static u32 Handle_ListenStateExpired(struct host_if_drv *drvHandler,
if (P2P_LISTEN_STATE) {
u8remain_on_chan_flag = false;
strWID.u16WIDid = (u16)WID_REMAIN_ON_CHAN;
- strWID.enuWIDtype = WID_STR;
+ strWID.type = WID_STR;
strWID.s32ValueSize = 2;
strWID.ps8WidVal = kmalloc(strWID.s32ValueSize, GFP_KERNEL);
@@ -3717,7 +3717,7 @@ static void Handle_SetMulticastFilter(struct host_if_drv *drvHandler,
PRINT_D(HOSTINF_DBG, "Setup Multicast Filter\n");
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.ps8WidVal = kmalloc(strWID.s32ValueSize, GFP_KERNEL);
if (strWID.ps8WidVal == NULL)
@@ -3776,7 +3776,7 @@ static s32 Handle_AddBASession(struct host_if_drv *drvHandler,
strHostIfBASessionInfo->u8Ted);
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.s32ValueSize = BLOCK_ACK_REQ_SIZE;
ptr = strWID.ps8WidVal;
@@ -3810,7 +3810,7 @@ static s32 Handle_AddBASession(struct host_if_drv *drvHandler,
strWID.u16WIDid = (u16)WID_11E_P_ACTION_REQ;
- strWID.enuWIDtype = WID_STR;
+ strWID.type = WID_STR;
strWID.s32ValueSize = 15;
ptr = strWID.ps8WidVal;
/* *ptr++ = 0x14; */
@@ -3862,7 +3862,7 @@ static s32 Handle_DelAllRxBASessions(struct host_if_drv *drvHandler,
strHostIfBASessionInfo->u8Ted);
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.s32ValueSize = BLOCK_ACK_REQ_SIZE;
ptr = strWID.ps8WidVal;
@@ -4161,7 +4161,7 @@ s32 host_int_remove_key(struct host_if_drv *hWFIDrv, const u8 *pu8StaAddress)
struct wid strWID;
strWID.u16WIDid = (u16)WID_REMOVE_KEY;
- strWID.enuWIDtype = WID_STR;
+ strWID.type = WID_STR;
strWID.ps8WidVal = (s8 *)pu8StaAddress;
strWID.s32ValueSize = 6;
@@ -4683,7 +4683,7 @@ s32 host_int_get_pmkid_info(struct host_if_drv *hWFIDrv, u8 *pu8PmkidInfoArray,
struct wid strWID;
strWID.u16WIDid = (u16)WID_PMKID_INFO;
- strWID.enuWIDtype = WID_STR;
+ strWID.type = WID_STR;
strWID.s32ValueSize = u32PmkidInfoLen;
strWID.ps8WidVal = pu8PmkidInfoArray;
@@ -4712,7 +4712,7 @@ s32 host_int_set_RSNAConfigPSKPassPhrase(struct host_if_drv *hWFIDrv, u8 *pu8Pas
/*validating psk length*/
if ((u8Psklength > 7) && (u8Psklength < 65)) {
strWID.u16WIDid = (u16)WID_11I_PSK;
- strWID.enuWIDtype = WID_STR;
+ strWID.type = WID_STR;
strWID.ps8WidVal = pu8PassPhrase;
strWID.s32ValueSize = u8Psklength;
}
@@ -4805,7 +4805,7 @@ s32 host_int_get_RSNAConfigPSKPassPhrase(struct host_if_drv *hWFIDrv,
struct wid strWID;
strWID.u16WIDid = (u16)WID_11I_PSK;
- strWID.enuWIDtype = WID_STR;
+ strWID.type = WID_STR;
strWID.s32ValueSize = u8Psklength;
strWID.ps8WidVal = pu8PassPhrase;
@@ -4832,7 +4832,7 @@ s32 host_int_set_start_scan_req(struct host_if_drv *hWFIDrv, u8 scanSource)
struct wid strWID;
strWID.u16WIDid = (u16)WID_START_SCAN_REQ;
- strWID.enuWIDtype = WID_CHAR;
+ strWID.type = WID_CHAR;
strWID.ps8WidVal = (s8 *)&scanSource;
strWID.s32ValueSize = sizeof(char);
@@ -4860,7 +4860,7 @@ s32 host_int_get_start_scan_req(struct host_if_drv *hWFIDrv, u8 *pu8ScanSource)
struct wid strWID;
strWID.u16WIDid = (u16)WID_START_SCAN_REQ;
- strWID.enuWIDtype = WID_CHAR;
+ strWID.type = WID_CHAR;
strWID.ps8WidVal = (s8 *)pu8ScanSource;
strWID.s32ValueSize = sizeof(char);
@@ -5057,7 +5057,7 @@ s32 host_int_disconnect_station(struct host_if_drv *hWFIDrv, u8 assoc_id)
struct wid strWID;
strWID.u16WIDid = (u16)WID_DISCONNECT;
- strWID.enuWIDtype = WID_CHAR;
+ strWID.type = WID_CHAR;
strWID.ps8WidVal = (s8 *)&assoc_id;
strWID.s32ValueSize = sizeof(char);
@@ -5096,7 +5096,7 @@ s32 host_int_get_assoc_req_info(struct host_if_drv *hWFIDrv, u8 *pu8AssocReqInfo
struct wid strWID;
strWID.u16WIDid = (u16)WID_ASSOC_REQ_INFO;
- strWID.enuWIDtype = WID_STR;
+ strWID.type = WID_STR;
strWID.ps8WidVal = pu8AssocReqInfo;
strWID.s32ValueSize = u32AssocReqInfoLen;
@@ -5127,7 +5127,7 @@ s32 host_int_get_assoc_res_info(struct host_if_drv *hWFIDrv, u8 *pu8AssocRespInf
}
strWID.u16WIDid = (u16)WID_ASSOC_RES_INFO;
- strWID.enuWIDtype = WID_STR;
+ strWID.type = WID_STR;
strWID.ps8WidVal = pu8AssocRespInfo;
strWID.s32ValueSize = u32MaxAssocRespInfoLen;
@@ -5167,7 +5167,7 @@ s32 host_int_get_rx_power_level(struct host_if_drv *hWFIDrv, u8 *pu8RxPowerLevel
struct wid strWID;
strWID.u16WIDid = (u16)WID_RX_POWER_LEVEL;
- strWID.enuWIDtype = WID_STR;
+ strWID.type = WID_STR;
strWID.ps8WidVal = pu8RxPowerLevel;
strWID.s32ValueSize = u32RxPowerLevelLen;
@@ -5357,7 +5357,7 @@ s32 host_int_test_set_int_wid(struct host_if_drv *hWFIDrv, u32 u32TestMemAddr)
/*prepare configuration packet*/
strWID.u16WIDid = (u16)WID_MEMORY_ADDRESS;
- strWID.enuWIDtype = WID_INT;
+ strWID.type = WID_INT;
strWID.ps8WidVal = (char *)&u32TestMemAddr;
strWID.s32ValueSize = sizeof(u32);
@@ -5442,7 +5442,7 @@ s32 host_int_test_get_int_wid(struct host_if_drv *hWFIDrv, u32 *pu32TestMemAddr)
}
strWID.u16WIDid = (u16)WID_MEMORY_ADDRESS;
- strWID.enuWIDtype = WID_INT;
+ strWID.type = WID_INT;
strWID.ps8WidVal = (s8 *)pu32TestMemAddr;
strWID.s32ValueSize = sizeof(u32);
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 04/10] staging: wilc1000: rename the member variable, u16WIDid of wid
2015-10-06 9:42 [PATCH 01/10] staging: wilc1000: remove typedef from tstrWID Tony Cho
2015-10-06 9:42 ` [PATCH 02/10] staging: wilc1000: remove typedef from tenuWIDtype Tony Cho
2015-10-06 9:42 ` [PATCH 03/10] staging: wilc1000: rename the member variable, enuWIDtype of wid Tony Cho
@ 2015-10-06 9:42 ` Tony Cho
2015-10-06 9:42 ` [PATCH 05/10] staging: wilc1000: rename the member variable, s32ValueSize " Tony Cho
` (6 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Tony Cho @ 2015-10-06 9:42 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
From: Leo Kim <leo.kim@atmel.com>
This patch renames u16WIDid of struct wid to id.
Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/coreconfigurator.c | 8 +-
drivers/staging/wilc1000/coreconfigurator.h | 2 +-
drivers/staging/wilc1000/host_interface.c | 188 ++++++++++++++--------------
3 files changed, 99 insertions(+), 99 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index f5913377..87636c0 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -604,7 +604,7 @@ s32 send_config_pkt(u8 mode, struct wid *wids, u32 count, u32 drv)
PRINT_INFO(CORECONFIG_DBG, "Sending CFG packet [%d][%d]\n", !counter,
(counter == count - 1));
if (!wilc_wlan_cfg_get(!counter,
- wids[counter].u16WIDid,
+ wids[counter].id,
(counter == count - 1),
drv)) {
ret = -1;
@@ -615,16 +615,16 @@ 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].u16WIDid,
+ wids[counter].id,
wids[counter].ps8WidVal,
wids[counter].s32ValueSize);
}
} else if (mode == SET_CFG) {
for (counter = 0; counter < count; counter++) {
- PRINT_D(CORECONFIG_DBG, "Sending config SET PACKET WID:%x\n", wids[counter].u16WIDid);
+ PRINT_D(CORECONFIG_DBG, "Sending config SET PACKET WID:%x\n", wids[counter].id);
if (!wilc_wlan_cfg_set(!counter,
- wids[counter].u16WIDid,
+ wids[counter].id,
wids[counter].ps8WidVal,
wids[counter].s32ValueSize,
(counter == count - 1),
diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h
index 27c1a86..0d3bff7 100644
--- a/drivers/staging/wilc1000/coreconfigurator.h
+++ b/drivers/staging/wilc1000/coreconfigurator.h
@@ -71,7 +71,7 @@ typedef enum {
} tenuConnectSts;
struct wid {
- u16 u16WIDid;
+ u16 id;
enum WID_TYPE type;
s32 s32ValueSize;
s8 *ps8WidVal;
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index e9fe950..15c1781 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -575,7 +575,7 @@ static s32 Handle_SetChannel(struct host_if_drv *drvHandler,
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
/*prepare configuration packet*/
- strWID.u16WIDid = (u16)WID_CURRENT_CHANNEL;
+ strWID.id = (u16)WID_CURRENT_CHANNEL;
strWID.type = WID_CHAR;
strWID.ps8WidVal = (char *)&(pstrHostIFSetChan->u8SetChan);
strWID.s32ValueSize = sizeof(char);
@@ -611,7 +611,7 @@ static s32 Handle_SetWfiDrvHandler(struct host_if_drv *drvHandler,
/*prepare configuration packet*/
- strWID.u16WIDid = (u16)WID_SET_DRV_HANDLER;
+ strWID.id = (u16)WID_SET_DRV_HANDLER;
strWID.type = WID_INT;
strWID.ps8WidVal = (s8 *)&(pstrHostIfSetDrvHandler->u32Address);
strWID.s32ValueSize = sizeof(u32);
@@ -652,7 +652,7 @@ static s32 Handle_SetOperationMode(struct host_if_drv *drvHandler,
/*prepare configuration packet*/
- strWID.u16WIDid = (u16)WID_SET_OPERATION_MODE;
+ strWID.id = (u16)WID_SET_OPERATION_MODE;
strWID.type = WID_INT;
strWID.ps8WidVal = (s8 *)&(pstrHostIfSetOperationMode->u32Mode);
strWID.s32ValueSize = sizeof(u32);
@@ -701,7 +701,7 @@ s32 Handle_set_IPAddress(struct host_if_drv *drvHandler, u8 *pu8IPAddr, u8 idx)
memcpy(gs8SetIP[idx], pu8IPAddr, IP_ALEN);
/*prepare configuration packet*/
- strWID.u16WIDid = (u16)WID_IP_ADDRESS;
+ strWID.id = (u16)WID_IP_ADDRESS;
strWID.type = WID_STR;
strWID.ps8WidVal = (u8 *)pu8IPAddr;
strWID.s32ValueSize = IP_ALEN;
@@ -740,7 +740,7 @@ s32 Handle_get_IPAddress(struct host_if_drv *drvHandler, u8 *pu8IPAddr, u8 idx)
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
/*prepare configuration packet*/
- strWID.u16WIDid = (u16)WID_IP_ADDRESS;
+ strWID.id = (u16)WID_IP_ADDRESS;
strWID.type = WID_STR;
strWID.ps8WidVal = kmalloc(IP_ALEN, GFP_KERNEL);
strWID.s32ValueSize = IP_ALEN;
@@ -796,7 +796,7 @@ static s32 Handle_SetMacAddress(struct host_if_drv *drvHandler,
memcpy(mac_buf, pstrHostIfSetMacAddress->u8MacAddress, ETH_ALEN);
/*prepare configuration packet*/
- strWID.u16WIDid = (u16)WID_MAC_ADDR;
+ strWID.id = (u16)WID_MAC_ADDR;
strWID.type = WID_STR;
strWID.ps8WidVal = mac_buf;
strWID.s32ValueSize = ETH_ALEN;
@@ -831,7 +831,7 @@ static s32 Handle_GetMacAddress(struct host_if_drv *drvHandler,
struct wid strWID;
/*prepare configuration packet*/
- strWID.u16WIDid = (u16)WID_MAC_ADDR;
+ strWID.id = (u16)WID_MAC_ADDR;
strWID.type = WID_STR;
strWID.ps8WidVal = pstrHostIfGetMacAddress->u8MacAddress;
strWID.s32ValueSize = ETH_ALEN;
@@ -880,7 +880,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
/*----------------------------------------------------------*/
/* validate input then copy>> need to check value 4 and 5 */
if (strHostIFCfgParamAttr->pstrCfgParamVal.bss_type < 6) {
- strWIDList[u8WidCnt].u16WIDid = WID_BSS_TYPE;
+ strWIDList[u8WidCnt].id = WID_BSS_TYPE;
strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.bss_type;
strWIDList[u8WidCnt].type = WID_CHAR;
strWIDList[u8WidCnt].s32ValueSize = sizeof(char);
@@ -900,7 +900,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
/*------------------------------------------------------*/
/*validate Possible values*/
if ((strHostIFCfgParamAttr->pstrCfgParamVal.auth_type) == 1 || (strHostIFCfgParamAttr->pstrCfgParamVal.auth_type) == 2 || (strHostIFCfgParamAttr->pstrCfgParamVal.auth_type) == 5) {
- strWIDList[u8WidCnt].u16WIDid = WID_AUTH_TYPE;
+ strWIDList[u8WidCnt].id = WID_AUTH_TYPE;
strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.auth_type;
strWIDList[u8WidCnt].type = WID_CHAR;
strWIDList[u8WidCnt].s32ValueSize = sizeof(char);
@@ -915,7 +915,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.u32SetCfgFlag & AUTHEN_TIMEOUT) {
/* range is 1 to 65535. */
if (strHostIFCfgParamAttr->pstrCfgParamVal.auth_timeout > 0 && strHostIFCfgParamAttr->pstrCfgParamVal.auth_timeout < 65536) {
- strWIDList[u8WidCnt].u16WIDid = WID_AUTH_TIMEOUT;
+ strWIDList[u8WidCnt].id = WID_AUTH_TIMEOUT;
strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.auth_timeout;
strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].s32ValueSize = sizeof(u16);
@@ -936,7 +936,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
/* MAX_PSPOLL_PS = 4 */
/*----------------------------------------------------------*/
if (strHostIFCfgParamAttr->pstrCfgParamVal.power_mgmt_mode < 5) {
- strWIDList[u8WidCnt].u16WIDid = WID_POWER_MANAGEMENT;
+ 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);
@@ -951,7 +951,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.u32SetCfgFlag & RETRY_SHORT) {
/* range from 1 to 256 */
if ((strHostIFCfgParamAttr->pstrCfgParamVal.short_retry_limit > 0) && (strHostIFCfgParamAttr->pstrCfgParamVal.short_retry_limit < 256)) {
- strWIDList[u8WidCnt].u16WIDid = WID_SHORT_RETRY_LIMIT;
+ 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);
@@ -966,7 +966,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.u32SetCfgFlag & RETRY_LONG) {
/* range from 1 to 256 */
if ((strHostIFCfgParamAttr->pstrCfgParamVal.long_retry_limit > 0) && (strHostIFCfgParamAttr->pstrCfgParamVal.long_retry_limit < 256)) {
- strWIDList[u8WidCnt].u16WIDid = WID_LONG_RETRY_LIMIT;
+ strWIDList[u8WidCnt].id = WID_LONG_RETRY_LIMIT;
strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.long_retry_limit;
strWIDList[u8WidCnt].type = WID_SHORT;
@@ -982,7 +982,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.u32SetCfgFlag & FRAG_THRESHOLD) {
if (strHostIFCfgParamAttr->pstrCfgParamVal.frag_threshold > 255 && strHostIFCfgParamAttr->pstrCfgParamVal.frag_threshold < 7937) {
- strWIDList[u8WidCnt].u16WIDid = WID_FRAG_THRESHOLD;
+ strWIDList[u8WidCnt].id = WID_FRAG_THRESHOLD;
strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.frag_threshold;
strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].s32ValueSize = sizeof(u16);
@@ -997,7 +997,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.u32SetCfgFlag & RTS_THRESHOLD) {
/* range 256 to 65535 */
if (strHostIFCfgParamAttr->pstrCfgParamVal.rts_threshold > 255 && strHostIFCfgParamAttr->pstrCfgParamVal.rts_threshold < 65536) {
- strWIDList[u8WidCnt].u16WIDid = WID_RTS_THRESHOLD;
+ strWIDList[u8WidCnt].id = WID_RTS_THRESHOLD;
strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.rts_threshold;
strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].s32ValueSize = sizeof(u16);
@@ -1016,7 +1016,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
/* Auto= 2 */
/*------------------------------------------------------*/
if (strHostIFCfgParamAttr->pstrCfgParamVal.preamble_type < 3) {
- strWIDList[u8WidCnt].u16WIDid = WID_PREAMBLE;
+ strWIDList[u8WidCnt].id = WID_PREAMBLE;
strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.preamble_type;
strWIDList[u8WidCnt].type = WID_CHAR;
strWIDList[u8WidCnt].s32ValueSize = sizeof(char);
@@ -1030,7 +1030,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
}
if (strHostIFCfgParamAttr->pstrCfgParamVal.u32SetCfgFlag & SHORT_SLOT_ALLOWED) {
if (strHostIFCfgParamAttr->pstrCfgParamVal.short_slot_allowed < 2) {
- strWIDList[u8WidCnt].u16WIDid = WID_SHORT_SLOT_ALLOWED;
+ 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);
@@ -1048,7 +1048,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
/* this information is useful for external supplicant */
/*Input Values: 1 for enable and 0 for disable. */
if (strHostIFCfgParamAttr->pstrCfgParamVal.txop_prot_disabled < 2) {
- strWIDList[u8WidCnt].u16WIDid = WID_11N_TXOP_PROT_DISABLE;
+ 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);
@@ -1063,7 +1063,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.u32SetCfgFlag & BEACON_INTERVAL) {
/* range is 1 to 65535. */
if (strHostIFCfgParamAttr->pstrCfgParamVal.beacon_interval > 0 && strHostIFCfgParamAttr->pstrCfgParamVal.beacon_interval < 65536) {
- strWIDList[u8WidCnt].u16WIDid = WID_BEACON_INTERVAL;
+ strWIDList[u8WidCnt].id = WID_BEACON_INTERVAL;
strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.beacon_interval;
strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].s32ValueSize = sizeof(u16);
@@ -1078,7 +1078,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.u32SetCfgFlag & DTIM_PERIOD) {
/* range is 1 to 255. */
if (strHostIFCfgParamAttr->pstrCfgParamVal.dtim_period > 0 && strHostIFCfgParamAttr->pstrCfgParamVal.dtim_period < 256) {
- strWIDList[u8WidCnt].u16WIDid = WID_DTIM_PERIOD;
+ strWIDList[u8WidCnt].id = WID_DTIM_PERIOD;
strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.dtim_period;
strWIDList[u8WidCnt].type = WID_CHAR;
strWIDList[u8WidCnt].s32ValueSize = sizeof(char);
@@ -1097,7 +1097,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
/* SITE_SURVEY_OFF = 2 */
/*----------------------------------------------------------------------*/
if (strHostIFCfgParamAttr->pstrCfgParamVal.site_survey_enabled < 3) {
- strWIDList[u8WidCnt].u16WIDid = WID_SITE_SURVEY;
+ 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);
@@ -1112,7 +1112,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.u32SetCfgFlag & SITE_SURVEY_SCAN_TIME) {
/* range is 1 to 65535. */
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].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);
@@ -1127,7 +1127,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.u32SetCfgFlag & ACTIVE_SCANTIME) {
/* range is 1 to 65535. */
if (strHostIFCfgParamAttr->pstrCfgParamVal.active_scan_time > 0 && strHostIFCfgParamAttr->pstrCfgParamVal.active_scan_time < 65536) {
- strWIDList[u8WidCnt].u16WIDid = WID_ACTIVE_SCAN_TIME;
+ 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);
@@ -1142,7 +1142,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.u32SetCfgFlag & PASSIVE_SCANTIME) {
/* range is 1 to 65535. */
if (strHostIFCfgParamAttr->pstrCfgParamVal.passive_scan_time > 0 && strHostIFCfgParamAttr->pstrCfgParamVal.passive_scan_time < 65536) {
- strWIDList[u8WidCnt].u16WIDid = WID_PASSIVE_SCAN_TIME;
+ 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);
@@ -1167,7 +1167,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
|| curr_tx_rate == MBPS_9 || curr_tx_rate == MBPS_12
|| curr_tx_rate == MBPS_18 || curr_tx_rate == MBPS_24
|| curr_tx_rate == MBPS_36 || curr_tx_rate == MBPS_48 || curr_tx_rate == MBPS_54) {
- strWIDList[u8WidCnt].u16WIDid = WID_CURRENT_TX_RATE;
+ strWIDList[u8WidCnt].id = WID_CURRENT_TX_RATE;
strWIDList[u8WidCnt].ps8WidVal = (s8 *)&curr_tx_rate;
strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].s32ValueSize = sizeof(u16);
@@ -1254,7 +1254,7 @@ static s32 Handle_Scan(struct host_if_drv *drvHandler,
pstrWFIDrv->strWILC_UsrScanReq.u32RcvdChCount = 0;
- strWIDList[u32WidsCount].u16WIDid = (u16)WID_SSID_PROBE_REQ;
+ strWIDList[u32WidsCount].id = (u16)WID_SSID_PROBE_REQ;
strWIDList[u32WidsCount].type = WID_STR;
for (i = 0; i < pstrHostIFscanAttr->strHiddenNetwork.u8ssidnum; i++)
@@ -1285,7 +1285,7 @@ static s32 Handle_Scan(struct host_if_drv *drvHandler,
/* if((pstrHostIFscanAttr->pu8IEs != NULL) && (pstrHostIFscanAttr->IEsLen != 0)) */
{
/* IEs to be inserted in Probe Request */
- strWIDList[u32WidsCount].u16WIDid = WID_INFO_ELEMENT_PROBE;
+ strWIDList[u32WidsCount].id = WID_INFO_ELEMENT_PROBE;
strWIDList[u32WidsCount].type = WID_BIN_DATA;
strWIDList[u32WidsCount].ps8WidVal = pstrHostIFscanAttr->pu8IEs;
strWIDList[u32WidsCount].s32ValueSize = pstrHostIFscanAttr->IEsLen;
@@ -1293,14 +1293,14 @@ static s32 Handle_Scan(struct host_if_drv *drvHandler,
}
/*Scan Type*/
- strWIDList[u32WidsCount].u16WIDid = WID_SCAN_TYPE;
+ strWIDList[u32WidsCount].id = WID_SCAN_TYPE;
strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].s32ValueSize = sizeof(char);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrHostIFscanAttr->u8ScanType));
u32WidsCount++;
/*list of channels to be scanned*/
- strWIDList[u32WidsCount].u16WIDid = WID_SCAN_CHANNEL_LIST;
+ strWIDList[u32WidsCount].id = WID_SCAN_CHANNEL_LIST;
strWIDList[u32WidsCount].type = WID_BIN_DATA;
if (pstrHostIFscanAttr->pu8ChnlFreqList != NULL && pstrHostIFscanAttr->u8ChnlListLen > 0) {
@@ -1317,7 +1317,7 @@ static s32 Handle_Scan(struct host_if_drv *drvHandler,
u32WidsCount++;
/*Scan Request*/
- strWIDList[u32WidsCount].u16WIDid = WID_START_SCAN_REQ;
+ strWIDList[u32WidsCount].id = WID_START_SCAN_REQ;
strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].s32ValueSize = sizeof(char);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrHostIFscanAttr->u8ScanSource));
@@ -1400,7 +1400,7 @@ static s32 Handle_ScanDone(struct host_if_drv *drvHandler, tenuScanEvent enuEven
if (enuEvent == SCAN_EVENT_ABORTED) {
PRINT_D(GENERIC_DBG, "Abort running scan\n");
u8abort_running_scan = 1;
- strWID.u16WIDid = (u16)WID_ABORT_RUNNING_SCAN;
+ strWID.id = (u16)WID_ABORT_RUNNING_SCAN;
strWID.type = WID_CHAR;
strWID.ps8WidVal = (s8 *)&u8abort_running_scan;
strWID.s32ValueSize = sizeof(char);
@@ -1496,19 +1496,19 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler,
pstrWFIDrv->strWILC_UsrConnReq.pfUserConnectResult = pstrHostIFconnectAttr->pfConnectResult;
pstrWFIDrv->strWILC_UsrConnReq.u32UserConnectPvoid = pstrHostIFconnectAttr->pvUserArg;
- strWIDList[u32WidsCount].u16WIDid = WID_SUCCESS_FRAME_COUNT;
+ strWIDList[u32WidsCount].id = WID_SUCCESS_FRAME_COUNT;
strWIDList[u32WidsCount].type = WID_INT;
strWIDList[u32WidsCount].s32ValueSize = sizeof(u32);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(dummyval));
u32WidsCount++;
- strWIDList[u32WidsCount].u16WIDid = WID_RECEIVED_FRAGMENT_COUNT;
+ strWIDList[u32WidsCount].id = WID_RECEIVED_FRAGMENT_COUNT;
strWIDList[u32WidsCount].type = WID_INT;
strWIDList[u32WidsCount].s32ValueSize = sizeof(u32);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(dummyval));
u32WidsCount++;
- strWIDList[u32WidsCount].u16WIDid = WID_FAILED_COUNT;
+ strWIDList[u32WidsCount].id = WID_FAILED_COUNT;
strWIDList[u32WidsCount].type = WID_INT;
strWIDList[u32WidsCount].s32ValueSize = sizeof(u32);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(dummyval));
@@ -1518,7 +1518,7 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler,
/* (gWFiDrvHandle->strWILC_UsrConnReq.ConnReqIEsLen != 0)) */
{
/* IEs to be inserted in Association Request */
- strWIDList[u32WidsCount].u16WIDid = WID_INFO_ELEMENT_ASSOCIATE;
+ 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;
@@ -1532,7 +1532,7 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler,
gu32FlushedInfoElemAsocSize);
}
}
- strWIDList[u32WidsCount].u16WIDid = (u16)WID_11I_MODE;
+ strWIDList[u32WidsCount].id = (u16)WID_11I_MODE;
strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].s32ValueSize = sizeof(char);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrWFIDrv->strWILC_UsrConnReq.u8security));
@@ -1544,7 +1544,7 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler,
PRINT_INFO(HOSTINF_DBG, "Encrypt Mode = %x\n", pstrWFIDrv->strWILC_UsrConnReq.u8security);
- strWIDList[u32WidsCount].u16WIDid = (u16)WID_AUTH_TYPE;
+ strWIDList[u32WidsCount].id = (u16)WID_AUTH_TYPE;
strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].s32ValueSize = sizeof(char);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&pstrWFIDrv->strWILC_UsrConnReq.tenuAuth_type);
@@ -1565,7 +1565,7 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler,
PRINT_D(HOSTINF_DBG, "Connecting to network of SSID %s on channel %d\n",
pstrWFIDrv->strWILC_UsrConnReq.pu8ssid, pstrHostIFconnectAttr->u8channel);
- strWIDList[u32WidsCount].u16WIDid = (u16)WID_JOIN_REQ_EXTENDED;
+ strWIDList[u32WidsCount].id = (u16)WID_JOIN_REQ_EXTENDED;
strWIDList[u32WidsCount].type = WID_STR;
/*Sending NoA attributes during connection*/
@@ -1812,13 +1812,13 @@ static s32 Handle_FlushConnect(struct host_if_drv *drvHandler)
/* IEs to be inserted in Association Request */
- strWIDList[u32WidsCount].u16WIDid = WID_INFO_ELEMENT_ASSOCIATE;
+ strWIDList[u32WidsCount].id = WID_INFO_ELEMENT_ASSOCIATE;
strWIDList[u32WidsCount].type = WID_BIN_DATA;
strWIDList[u32WidsCount].ps8WidVal = gu8FlushedInfoElemAsoc;
strWIDList[u32WidsCount].s32ValueSize = gu32FlushedInfoElemAsocSize;
u32WidsCount++;
- strWIDList[u32WidsCount].u16WIDid = (u16)WID_11I_MODE;
+ strWIDList[u32WidsCount].id = (u16)WID_11I_MODE;
strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].s32ValueSize = sizeof(char);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(gu8Flushed11iMode));
@@ -1826,13 +1826,13 @@ static s32 Handle_FlushConnect(struct host_if_drv *drvHandler)
- strWIDList[u32WidsCount].u16WIDid = (u16)WID_AUTH_TYPE;
+ strWIDList[u32WidsCount].id = (u16)WID_AUTH_TYPE;
strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].s32ValueSize = sizeof(char);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&gu8FlushedAuthType);
u32WidsCount++;
- strWIDList[u32WidsCount].u16WIDid = (u16)WID_JOIN_REQ_EXTENDED;
+ strWIDList[u32WidsCount].id = (u16)WID_JOIN_REQ_EXTENDED;
strWIDList[u32WidsCount].type = WID_STR;
strWIDList[u32WidsCount].s32ValueSize = gu32FlushedJoinReqSize;
strWIDList[u32WidsCount].ps8WidVal = (s8 *)gu8FlushedJoinReq;
@@ -1917,7 +1917,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
* WID_DISCONNECT} */
- strWID.u16WIDid = (u16)WID_DISCONNECT;
+ strWID.id = (u16)WID_DISCONNECT;
strWID.type = WID_CHAR;
strWID.ps8WidVal = (s8 *)&u16DummyReasonCode;
strWID.s32ValueSize = sizeof(char);
@@ -2424,17 +2424,17 @@ static int Handle_Key(struct host_if_drv *drvHandler,
PRINT_D(HOSTINF_DBG, "Handling WEP key\n");
PRINT_D(GENERIC_DBG, "ID Hostint is %d\n", (pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx));
- strWIDList[0].u16WIDid = (u16)WID_11I_MODE;
+ strWIDList[0].id = (u16)WID_11I_MODE;
strWIDList[0].type = WID_CHAR;
strWIDList[0].s32ValueSize = sizeof(char);
strWIDList[0].ps8WidVal = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8mode));
- strWIDList[1].u16WIDid = WID_AUTH_TYPE;
+ strWIDList[1].id = WID_AUTH_TYPE;
strWIDList[1].type = WID_CHAR;
strWIDList[1].s32ValueSize = sizeof(char);
strWIDList[1].ps8WidVal = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.tenuAuth_type));
- strWIDList[2].u16WIDid = (u16)WID_KEY_ID;
+ strWIDList[2].id = (u16)WID_KEY_ID;
strWIDList[2].type = WID_CHAR;
strWIDList[2].ps8WidVal = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx));
@@ -2455,7 +2455,7 @@ static int Handle_Key(struct host_if_drv *drvHandler,
kfree(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.pu8WepKey);
- strWIDList[3].u16WIDid = (u16)WID_WEP_KEY_VALUE;
+ strWIDList[3].id = (u16)WID_WEP_KEY_VALUE;
strWIDList[3].type = WID_STR;
strWIDList[3].s32ValueSize = pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8WepKeylen;
strWIDList[3].ps8WidVal = (s8 *)pu8keybuf;
@@ -2484,7 +2484,7 @@ static int Handle_Key(struct host_if_drv *drvHandler,
kfree(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.pu8WepKey);
- strWID.u16WIDid = (u16)WID_ADD_WEP_KEY;
+ strWID.id = (u16)WID_ADD_WEP_KEY;
strWID.type = WID_STR;
strWID.ps8WidVal = (s8 *)pu8keybuf;
strWID.s32ValueSize = pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8WepKeylen + 2;
@@ -2495,7 +2495,7 @@ static int Handle_Key(struct host_if_drv *drvHandler,
} else if (pstrHostIFkeyAttr->u8KeyAction & REMOVEKEY) {
PRINT_D(HOSTINF_DBG, "Removing key\n");
- strWID.u16WIDid = (u16)WID_REMOVE_WEP_KEY;
+ strWID.id = (u16)WID_REMOVE_WEP_KEY;
strWID.type = WID_STR;
s8idxarray[0] = (s8)pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx;
@@ -2505,7 +2505,7 @@ static int Handle_Key(struct host_if_drv *drvHandler,
s32Error = send_config_pkt(SET_CFG, &strWID, 1,
get_id_from_handler(pstrWFIDrv));
} else {
- strWID.u16WIDid = (u16)WID_KEY_ID;
+ strWID.id = (u16)WID_KEY_ID;
strWID.type = WID_CHAR;
strWID.ps8WidVal = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx));
strWID.s32ValueSize = sizeof(char);
@@ -2548,12 +2548,12 @@ static int Handle_Key(struct host_if_drv *drvHandler,
memcpy(pu8keybuf + 16, pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwpaAttr.pu8key,
pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwpaAttr.u8Keylen);
/* pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwpaAttr.u8Ciphermode = 0X51; */
- strWIDList[0].u16WIDid = (u16)WID_11I_MODE;
+ strWIDList[0].id = (u16)WID_11I_MODE;
strWIDList[0].type = WID_CHAR;
strWIDList[0].s32ValueSize = sizeof(char);
strWIDList[0].ps8WidVal = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwpaAttr.u8Ciphermode));
- strWIDList[1].u16WIDid = (u16)WID_ADD_RX_GTK;
+ 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;
@@ -2599,7 +2599,7 @@ static int Handle_Key(struct host_if_drv *drvHandler,
memcpy(pu8keybuf + 16, pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwpaAttr.pu8key,
pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwpaAttr.u8Keylen);
- strWID.u16WIDid = (u16)WID_ADD_RX_GTK;
+ strWID.id = (u16)WID_ADD_RX_GTK;
strWID.type = WID_STR;
strWID.ps8WidVal = (s8 *)pu8keybuf;
strWID.s32ValueSize = RX_MIC_KEY_MSG_LEN;
@@ -2651,12 +2651,12 @@ _WPARxGtk_end_case_:
pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwpaAttr.u8Keylen);
- strWIDList[0].u16WIDid = (u16)WID_11I_MODE;
+ strWIDList[0].id = (u16)WID_11I_MODE;
strWIDList[0].type = WID_CHAR;
strWIDList[0].s32ValueSize = sizeof(char);
strWIDList[0].ps8WidVal = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwpaAttr.u8Ciphermode));
- strWIDList[1].u16WIDid = (u16)WID_ADD_PTK;
+ 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;
@@ -2697,7 +2697,7 @@ _WPARxGtk_end_case_:
pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwpaAttr.u8Keylen);
- strWID.u16WIDid = (u16)WID_ADD_PTK;
+ strWID.id = (u16)WID_ADD_PTK;
strWID.type = WID_STR;
strWID.ps8WidVal = (s8 *)pu8keybuf;
strWID.s32ValueSize = PTK_KEY_MSG_LEN;
@@ -2737,7 +2737,7 @@ _WPAPtk_end_case_:
memcpy(pu8keybuf + ((PMKSA_KEY_LEN * i) + ETH_ALEN + 1), pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFpmkidAttr.pmkidlist[i].pmkid, PMKID_LEN);
}
- strWID.u16WIDid = (u16)WID_PMKID_INFO;
+ strWID.id = (u16)WID_PMKID_INFO;
strWID.type = WID_STR;
strWID.ps8WidVal = (s8 *)pu8keybuf;
strWID.s32ValueSize = (pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFpmkidAttr.numpmkid * PMKSA_KEY_LEN) + 1;
@@ -2775,7 +2775,7 @@ static void Handle_Disconnect(struct host_if_drv *drvHandler)
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
- strWID.u16WIDid = (u16)WID_DISCONNECT;
+ strWID.id = (u16)WID_DISCONNECT;
strWID.type = WID_CHAR;
strWID.ps8WidVal = (s8 *)&u16DummyReasonCode;
strWID.s32ValueSize = sizeof(char);
@@ -2899,7 +2899,7 @@ static s32 Handle_GetChnl(struct host_if_drv *drvHandler)
struct wid strWID;
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
- strWID.u16WIDid = (u16)WID_CURRENT_CHANNEL;
+ strWID.id = (u16)WID_CURRENT_CHANNEL;
strWID.type = WID_CHAR;
strWID.ps8WidVal = (s8 *)&gu8Chnl;
strWID.s32ValueSize = sizeof(char);
@@ -2938,7 +2938,7 @@ static void Handle_GetRssi(struct host_if_drv *drvHandler)
struct wid strWID;
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
- strWID.u16WIDid = (u16)WID_RSSI;
+ strWID.id = (u16)WID_RSSI;
strWID.type = WID_CHAR;
strWID.ps8WidVal = &gs8Rssi;
strWID.s32ValueSize = sizeof(char);
@@ -2967,7 +2967,7 @@ static void Handle_GetLinkspeed(struct host_if_drv *drvHandler)
gs8lnkspd = 0;
- strWID.u16WIDid = (u16)WID_LINKSPEED;
+ strWID.id = (u16)WID_LINKSPEED;
strWID.type = WID_CHAR;
strWID.ps8WidVal = &gs8lnkspd;
strWID.s32ValueSize = sizeof(char);
@@ -2991,31 +2991,31 @@ s32 Handle_GetStatistics(struct host_if_drv *drvHandler, tstrStatistics *pstrSta
struct wid strWIDList[5];
u32 u32WidsCount = 0, s32Error = 0;
- strWIDList[u32WidsCount].u16WIDid = WID_LINKSPEED;
+ strWIDList[u32WidsCount].id = WID_LINKSPEED;
strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].s32ValueSize = sizeof(char);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrStatistics->u8LinkSpeed));
u32WidsCount++;
- strWIDList[u32WidsCount].u16WIDid = WID_RSSI;
+ strWIDList[u32WidsCount].id = WID_RSSI;
strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].s32ValueSize = sizeof(char);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrStatistics->s8RSSI));
u32WidsCount++;
- strWIDList[u32WidsCount].u16WIDid = WID_SUCCESS_FRAME_COUNT;
+ strWIDList[u32WidsCount].id = WID_SUCCESS_FRAME_COUNT;
strWIDList[u32WidsCount].type = WID_INT;
strWIDList[u32WidsCount].s32ValueSize = sizeof(u32);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrStatistics->u32TxCount));
u32WidsCount++;
- strWIDList[u32WidsCount].u16WIDid = WID_RECEIVED_FRAGMENT_COUNT;
+ strWIDList[u32WidsCount].id = WID_RECEIVED_FRAGMENT_COUNT;
strWIDList[u32WidsCount].type = WID_INT;
strWIDList[u32WidsCount].s32ValueSize = sizeof(u32);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrStatistics->u32RxCount));
u32WidsCount++;
- strWIDList[u32WidsCount].u16WIDid = WID_FAILED_COUNT;
+ strWIDList[u32WidsCount].id = WID_FAILED_COUNT;
strWIDList[u32WidsCount].type = WID_INT;
strWIDList[u32WidsCount].s32ValueSize = sizeof(u32);
strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrStatistics->u32TxFailureCount));
@@ -3053,7 +3053,7 @@ static s32 Handle_Get_InActiveTime(struct host_if_drv *drvHandler,
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
- strWID.u16WIDid = (u16)WID_SET_STA_MAC_INACTIVE_TIME;
+ strWID.id = (u16)WID_SET_STA_MAC_INACTIVE_TIME;
strWID.type = WID_STR;
strWID.s32ValueSize = ETH_ALEN;
strWID.ps8WidVal = kmalloc(strWID.s32ValueSize, GFP_KERNEL);
@@ -3075,7 +3075,7 @@ static s32 Handle_Get_InActiveTime(struct host_if_drv *drvHandler,
}
- strWID.u16WIDid = (u16)WID_GET_INACTIVE_TIME;
+ strWID.id = (u16)WID_GET_INACTIVE_TIME;
strWID.type = WID_INT;
strWID.ps8WidVal = (s8 *)&gu32InactiveTime;
strWID.s32ValueSize = sizeof(u32);
@@ -3120,7 +3120,7 @@ static void Handle_AddBeacon(struct host_if_drv *drvHandler,
PRINT_D(HOSTINF_DBG, "Adding BEACON\n");
- strWID.u16WIDid = (u16)WID_ADD_BEACON;
+ strWID.id = (u16)WID_ADD_BEACON;
strWID.type = WID_BIN;
strWID.s32ValueSize = pstrSetBeaconParam->u32HeadLen + pstrSetBeaconParam->u32TailLen + 16;
strWID.ps8WidVal = kmalloc(strWID.s32ValueSize, GFP_KERNEL);
@@ -3186,7 +3186,7 @@ static void Handle_DelBeacon(struct host_if_drv *drvHandler)
u8 *pu8CurrByte;
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
- strWID.u16WIDid = (u16)WID_DEL_BEACON;
+ strWID.id = (u16)WID_DEL_BEACON;
strWID.type = WID_CHAR;
strWID.s32ValueSize = sizeof(char);
strWID.ps8WidVal = &gu8DelBcn;
@@ -3280,7 +3280,7 @@ static void Handle_AddStation(struct host_if_drv *drvHandler,
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
PRINT_D(HOSTINF_DBG, "Handling add station\n");
- strWID.u16WIDid = (u16)WID_ADD_STA;
+ strWID.id = (u16)WID_ADD_STA;
strWID.type = WID_BIN;
strWID.s32ValueSize = WILC_ADD_STA_LENGTH + pstrStationParam->u8NumRates;
@@ -3322,7 +3322,7 @@ static void Handle_DelAllSta(struct host_if_drv *drvHandler,
u8 i;
u8 au8Zero_Buff[6] = {0};
- strWID.u16WIDid = (u16)WID_DEL_ALL_STA;
+ strWID.id = (u16)WID_DEL_ALL_STA;
strWID.type = WID_STR;
strWID.s32ValueSize = (pstrDelAllStaParam->u8Num_AssocSta * ETH_ALEN) + 1;
@@ -3375,7 +3375,7 @@ static void Handle_DelStation(struct host_if_drv *drvHandler,
u8 *pu8CurrByte;
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
- strWID.u16WIDid = (u16)WID_REMOVE_STA;
+ strWID.id = (u16)WID_REMOVE_STA;
strWID.type = WID_BIN;
strWID.s32ValueSize = ETH_ALEN;
@@ -3417,7 +3417,7 @@ static void Handle_EditStation(struct host_if_drv *drvHandler,
u8 *pu8CurrByte;
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
- strWID.u16WIDid = (u16)WID_EDIT_STA;
+ strWID.id = (u16)WID_EDIT_STA;
strWID.type = WID_BIN;
strWID.s32ValueSize = WILC_ADD_STA_LENGTH + pstrStationParam->u8NumRates;
@@ -3490,7 +3490,7 @@ static int Handle_RemainOnChan(struct host_if_drv *drvHandler,
PRINT_D(HOSTINF_DBG, "Setting channel :%d\n", pstrHostIfRemainOnChan->u16Channel);
u8remain_on_chan_flag = true;
- strWID.u16WIDid = (u16)WID_REMAIN_ON_CHAN;
+ strWID.id = (u16)WID_REMAIN_ON_CHAN;
strWID.type = WID_STR;
strWID.s32ValueSize = 2;
strWID.ps8WidVal = kmalloc(strWID.s32ValueSize, GFP_KERNEL);
@@ -3547,7 +3547,7 @@ static int Handle_RegisterFrame(struct host_if_drv *drvHandler,
PRINT_D(HOSTINF_DBG, "Handling frame register Flag : %d FrameType: %d\n", pstrHostIfRegisterFrame->bReg, pstrHostIfRegisterFrame->u16FrameType);
/*prepare configuration packet*/
- strWID.u16WIDid = (u16)WID_REGISTER_FRAME;
+ strWID.id = (u16)WID_REGISTER_FRAME;
strWID.type = WID_STR;
strWID.ps8WidVal = kmalloc(sizeof(u16) + 2, GFP_KERNEL);
if (strWID.ps8WidVal == NULL)
@@ -3599,7 +3599,7 @@ static u32 Handle_ListenStateExpired(struct host_if_drv *drvHandler,
/*This is to handle duplicate expiry messages (listen timer fired and supplicant called cancel_remain_on_channel())*/
if (P2P_LISTEN_STATE) {
u8remain_on_chan_flag = false;
- strWID.u16WIDid = (u16)WID_REMAIN_ON_CHAN;
+ strWID.id = (u16)WID_REMAIN_ON_CHAN;
strWID.type = WID_STR;
strWID.s32ValueSize = 2;
strWID.ps8WidVal = kmalloc(strWID.s32ValueSize, GFP_KERNEL);
@@ -3679,7 +3679,7 @@ static void Handle_PowerManagement(struct host_if_drv *drvHandler,
s8 s8PowerMode;
struct host_if_drv *pstrWFIDrv = (struct host_if_drv *)drvHandler;
- strWID.u16WIDid = (u16)WID_POWER_MANAGEMENT;
+ strWID.id = (u16)WID_POWER_MANAGEMENT;
if (strPowerMgmtParam->bIsEnabled == true)
s8PowerMode = MIN_FAST_PS;
@@ -3716,7 +3716,7 @@ static void Handle_SetMulticastFilter(struct host_if_drv *drvHandler,
PRINT_D(HOSTINF_DBG, "Setup Multicast Filter\n");
- strWID.u16WIDid = (u16)WID_SETUP_MULTICAST_FILTER;
+ 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);
@@ -3775,7 +3775,7 @@ static s32 Handle_AddBASession(struct host_if_drv *drvHandler,
strHostIfBASessionInfo->u16SessionTimeout,
strHostIfBASessionInfo->u8Ted);
- strWID.u16WIDid = (u16)WID_11E_P_ACTION_REQ;
+ 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;
@@ -3809,7 +3809,7 @@ static s32 Handle_AddBASession(struct host_if_drv *drvHandler,
PRINT_D(HOSTINF_DBG, "Couldn't open BA Session\n");
- strWID.u16WIDid = (u16)WID_11E_P_ACTION_REQ;
+ strWID.id = (u16)WID_11E_P_ACTION_REQ;
strWID.type = WID_STR;
strWID.s32ValueSize = 15;
ptr = strWID.ps8WidVal;
@@ -3861,7 +3861,7 @@ static s32 Handle_DelAllRxBASessions(struct host_if_drv *drvHandler,
strHostIfBASessionInfo->au8Bssid[2],
strHostIfBASessionInfo->u8Ted);
- strWID.u16WIDid = (u16)WID_DEL_ALL_RX_BA;
+ 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;
@@ -4160,7 +4160,7 @@ s32 host_int_remove_key(struct host_if_drv *hWFIDrv, const u8 *pu8StaAddress)
{
struct wid strWID;
- strWID.u16WIDid = (u16)WID_REMOVE_KEY;
+ strWID.id = (u16)WID_REMOVE_KEY;
strWID.type = WID_STR;
strWID.ps8WidVal = (s8 *)pu8StaAddress;
strWID.s32ValueSize = 6;
@@ -4682,7 +4682,7 @@ s32 host_int_get_pmkid_info(struct host_if_drv *hWFIDrv, u8 *pu8PmkidInfoArray,
{
struct wid strWID;
- strWID.u16WIDid = (u16)WID_PMKID_INFO;
+ strWID.id = (u16)WID_PMKID_INFO;
strWID.type = WID_STR;
strWID.s32ValueSize = u32PmkidInfoLen;
strWID.ps8WidVal = pu8PmkidInfoArray;
@@ -4711,7 +4711,7 @@ s32 host_int_set_RSNAConfigPSKPassPhrase(struct host_if_drv *hWFIDrv, u8 *pu8Pas
/*validating psk length*/
if ((u8Psklength > 7) && (u8Psklength < 65)) {
- strWID.u16WIDid = (u16)WID_11I_PSK;
+ strWID.id = (u16)WID_11I_PSK;
strWID.type = WID_STR;
strWID.ps8WidVal = pu8PassPhrase;
strWID.s32ValueSize = u8Psklength;
@@ -4804,7 +4804,7 @@ s32 host_int_get_RSNAConfigPSKPassPhrase(struct host_if_drv *hWFIDrv,
{
struct wid strWID;
- strWID.u16WIDid = (u16)WID_11I_PSK;
+ strWID.id = (u16)WID_11I_PSK;
strWID.type = WID_STR;
strWID.s32ValueSize = u8Psklength;
strWID.ps8WidVal = pu8PassPhrase;
@@ -4831,7 +4831,7 @@ s32 host_int_set_start_scan_req(struct host_if_drv *hWFIDrv, u8 scanSource)
{
struct wid strWID;
- strWID.u16WIDid = (u16)WID_START_SCAN_REQ;
+ strWID.id = (u16)WID_START_SCAN_REQ;
strWID.type = WID_CHAR;
strWID.ps8WidVal = (s8 *)&scanSource;
strWID.s32ValueSize = sizeof(char);
@@ -4859,7 +4859,7 @@ s32 host_int_get_start_scan_req(struct host_if_drv *hWFIDrv, u8 *pu8ScanSource)
{
struct wid strWID;
- strWID.u16WIDid = (u16)WID_START_SCAN_REQ;
+ strWID.id = (u16)WID_START_SCAN_REQ;
strWID.type = WID_CHAR;
strWID.ps8WidVal = (s8 *)pu8ScanSource;
strWID.s32ValueSize = sizeof(char);
@@ -5056,7 +5056,7 @@ s32 host_int_disconnect_station(struct host_if_drv *hWFIDrv, u8 assoc_id)
{
struct wid strWID;
- strWID.u16WIDid = (u16)WID_DISCONNECT;
+ strWID.id = (u16)WID_DISCONNECT;
strWID.type = WID_CHAR;
strWID.ps8WidVal = (s8 *)&assoc_id;
strWID.s32ValueSize = sizeof(char);
@@ -5095,7 +5095,7 @@ s32 host_int_get_assoc_req_info(struct host_if_drv *hWFIDrv, u8 *pu8AssocReqInfo
{
struct wid strWID;
- strWID.u16WIDid = (u16)WID_ASSOC_REQ_INFO;
+ strWID.id = (u16)WID_ASSOC_REQ_INFO;
strWID.type = WID_STR;
strWID.ps8WidVal = pu8AssocReqInfo;
strWID.s32ValueSize = u32AssocReqInfoLen;
@@ -5126,7 +5126,7 @@ s32 host_int_get_assoc_res_info(struct host_if_drv *hWFIDrv, u8 *pu8AssocRespInf
return -EFAULT;
}
- strWID.u16WIDid = (u16)WID_ASSOC_RES_INFO;
+ strWID.id = (u16)WID_ASSOC_RES_INFO;
strWID.type = WID_STR;
strWID.ps8WidVal = pu8AssocRespInfo;
strWID.s32ValueSize = u32MaxAssocRespInfoLen;
@@ -5166,7 +5166,7 @@ s32 host_int_get_rx_power_level(struct host_if_drv *hWFIDrv, u8 *pu8RxPowerLevel
{
struct wid strWID;
- strWID.u16WIDid = (u16)WID_RX_POWER_LEVEL;
+ strWID.id = (u16)WID_RX_POWER_LEVEL;
strWID.type = WID_STR;
strWID.ps8WidVal = pu8RxPowerLevel;
strWID.s32ValueSize = u32RxPowerLevelLen;
@@ -5356,7 +5356,7 @@ s32 host_int_test_set_int_wid(struct host_if_drv *hWFIDrv, u32 u32TestMemAddr)
}
/*prepare configuration packet*/
- strWID.u16WIDid = (u16)WID_MEMORY_ADDRESS;
+ strWID.id = (u16)WID_MEMORY_ADDRESS;
strWID.type = WID_INT;
strWID.ps8WidVal = (char *)&u32TestMemAddr;
strWID.s32ValueSize = sizeof(u32);
@@ -5441,7 +5441,7 @@ s32 host_int_test_get_int_wid(struct host_if_drv *hWFIDrv, u32 *pu32TestMemAddr)
return -EFAULT;
}
- strWID.u16WIDid = (u16)WID_MEMORY_ADDRESS;
+ strWID.id = (u16)WID_MEMORY_ADDRESS;
strWID.type = WID_INT;
strWID.ps8WidVal = (s8 *)pu32TestMemAddr;
strWID.s32ValueSize = sizeof(u32);
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 05/10] staging: wilc1000: rename the member variable, s32ValueSize of wid
2015-10-06 9:42 [PATCH 01/10] staging: wilc1000: remove typedef from tstrWID Tony Cho
` (2 preceding siblings ...)
2015-10-06 9:42 ` [PATCH 04/10] staging: wilc1000: rename the member variable, u16WIDid " Tony Cho
@ 2015-10-06 9:42 ` Tony Cho
2015-10-06 9:42 ` [PATCH 06/10] staging: wilc1000: rename the member variable, ps8WidVal " Tony Cho
` (5 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Tony Cho @ 2015-10-06 9:42 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
From: Leo Kim <leo.kim@atmel.com>
This patch renames s32ValueSize of struct wid to size.
Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
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));
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 06/10] staging: wilc1000: rename the member variable, ps8WidVal of wid
2015-10-06 9:42 [PATCH 01/10] staging: wilc1000: remove typedef from tstrWID Tony Cho
` (3 preceding siblings ...)
2015-10-06 9:42 ` [PATCH 05/10] staging: wilc1000: rename the member variable, s32ValueSize " Tony Cho
@ 2015-10-06 9:42 ` Tony Cho
2015-10-06 9:42 ` [PATCH 07/10] staging: wilc1000: remove unused struct tstrWidJoinReqExt Tony Cho
` (4 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Tony Cho @ 2015-10-06 9:42 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
From: Leo Kim <leo.kim@atmel.com>
This patch renames ps8WidVal of struct wid to val.
Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/coreconfigurator.c | 4 +-
drivers/staging/wilc1000/coreconfigurator.h | 2 +-
drivers/staging/wilc1000/host_interface.c | 278 ++++++++++++++--------------
3 files changed, 142 insertions(+), 142 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index c7cef57..7af3be2 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -616,7 +616,7 @@ s32 send_config_pkt(u8 mode, struct wid *wids, u32 count, u32 drv)
for (counter = 0; counter < count; counter++) {
wids[counter].size = wilc_wlan_cfg_get_val(
wids[counter].id,
- wids[counter].ps8WidVal,
+ wids[counter].val,
wids[counter].size);
}
@@ -625,7 +625,7 @@ s32 send_config_pkt(u8 mode, struct wid *wids, u32 count, u32 drv)
PRINT_D(CORECONFIG_DBG, "Sending config SET PACKET WID:%x\n", wids[counter].id);
if (!wilc_wlan_cfg_set(!counter,
wids[counter].id,
- wids[counter].ps8WidVal,
+ wids[counter].val,
wids[counter].size,
(counter == count - 1),
drv)) {
diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h
index 3595a0a..6294d92 100644
--- a/drivers/staging/wilc1000/coreconfigurator.h
+++ b/drivers/staging/wilc1000/coreconfigurator.h
@@ -74,7 +74,7 @@ struct wid {
u16 id;
enum WID_TYPE type;
s32 size;
- s8 *ps8WidVal;
+ s8 *val;
};
typedef struct {
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 7f529cc..61728da 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -577,7 +577,7 @@ static s32 Handle_SetChannel(struct host_if_drv *drvHandler,
/*prepare configuration packet*/
strWID.id = (u16)WID_CURRENT_CHANNEL;
strWID.type = WID_CHAR;
- strWID.ps8WidVal = (char *)&(pstrHostIFSetChan->u8SetChan);
+ strWID.val = (char *)&(pstrHostIFSetChan->u8SetChan);
strWID.size = sizeof(char);
PRINT_D(HOSTINF_DBG, "Setting channel\n");
@@ -613,7 +613,7 @@ static s32 Handle_SetWfiDrvHandler(struct host_if_drv *drvHandler,
/*prepare configuration packet*/
strWID.id = (u16)WID_SET_DRV_HANDLER;
strWID.type = WID_INT;
- strWID.ps8WidVal = (s8 *)&(pstrHostIfSetDrvHandler->u32Address);
+ strWID.val = (s8 *)&(pstrHostIfSetDrvHandler->u32Address);
strWID.size = sizeof(u32);
/*Sending Cfg*/
@@ -654,7 +654,7 @@ static s32 Handle_SetOperationMode(struct host_if_drv *drvHandler,
/*prepare configuration packet*/
strWID.id = (u16)WID_SET_OPERATION_MODE;
strWID.type = WID_INT;
- strWID.ps8WidVal = (s8 *)&(pstrHostIfSetOperationMode->u32Mode);
+ strWID.val = (s8 *)&(pstrHostIfSetOperationMode->u32Mode);
strWID.size = sizeof(u32);
/*Sending Cfg*/
@@ -703,7 +703,7 @@ s32 Handle_set_IPAddress(struct host_if_drv *drvHandler, u8 *pu8IPAddr, u8 idx)
/*prepare configuration packet*/
strWID.id = (u16)WID_IP_ADDRESS;
strWID.type = WID_STR;
- strWID.ps8WidVal = (u8 *)pu8IPAddr;
+ strWID.val = (u8 *)pu8IPAddr;
strWID.size = IP_ALEN;
s32Error = send_config_pkt(SET_CFG, &strWID, 1,
@@ -742,18 +742,18 @@ s32 Handle_get_IPAddress(struct host_if_drv *drvHandler, u8 *pu8IPAddr, u8 idx)
/*prepare configuration packet*/
strWID.id = (u16)WID_IP_ADDRESS;
strWID.type = WID_STR;
- strWID.ps8WidVal = kmalloc(IP_ALEN, GFP_KERNEL);
+ strWID.val = kmalloc(IP_ALEN, GFP_KERNEL);
strWID.size = IP_ALEN;
s32Error = send_config_pkt(GET_CFG, &strWID, 1,
get_id_from_handler(pstrWFIDrv));
- PRINT_INFO(HOSTINF_DBG, "%pI4\n", strWID.ps8WidVal);
+ PRINT_INFO(HOSTINF_DBG, "%pI4\n", strWID.val);
- memcpy(gs8GetIP[idx], strWID.ps8WidVal, IP_ALEN);
+ memcpy(gs8GetIP[idx], strWID.val, IP_ALEN);
/*get the value by searching the local copy*/
- kfree(strWID.ps8WidVal);
+ kfree(strWID.val);
if (memcmp(gs8GetIP[idx], gs8SetIP[idx], IP_ALEN) != 0)
host_int_setup_ipaddress(pstrWFIDrv, gs8SetIP[idx], idx);
@@ -798,9 +798,9 @@ static s32 Handle_SetMacAddress(struct host_if_drv *drvHandler,
/*prepare configuration packet*/
strWID.id = (u16)WID_MAC_ADDR;
strWID.type = WID_STR;
- strWID.ps8WidVal = mac_buf;
+ strWID.val = mac_buf;
strWID.size = ETH_ALEN;
- PRINT_D(GENERIC_DBG, "mac addr = :%pM\n", strWID.ps8WidVal);
+ PRINT_D(GENERIC_DBG, "mac addr = :%pM\n", strWID.val);
/*Sending Cfg*/
s32Error = send_config_pkt(SET_CFG, &strWID, 1,
get_id_from_handler(pstrWFIDrv));
@@ -833,7 +833,7 @@ static s32 Handle_GetMacAddress(struct host_if_drv *drvHandler,
/*prepare configuration packet*/
strWID.id = (u16)WID_MAC_ADDR;
strWID.type = WID_STR;
- strWID.ps8WidVal = pstrHostIfGetMacAddress->u8MacAddress;
+ strWID.val = pstrHostIfGetMacAddress->u8MacAddress;
strWID.size = ETH_ALEN;
/*Sending Cfg*/
@@ -881,7 +881,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
/* validate input then copy>> need to check value 4 and 5 */
if (strHostIFCfgParamAttr->pstrCfgParamVal.bss_type < 6) {
strWIDList[u8WidCnt].id = WID_BSS_TYPE;
- strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.bss_type;
+ strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.bss_type;
strWIDList[u8WidCnt].type = WID_CHAR;
strWIDList[u8WidCnt].size = sizeof(char);
pstrWFIDrv->strCfgValues.bss_type = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.bss_type;
@@ -901,7 +901,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
/*validate Possible values*/
if ((strHostIFCfgParamAttr->pstrCfgParamVal.auth_type) == 1 || (strHostIFCfgParamAttr->pstrCfgParamVal.auth_type) == 2 || (strHostIFCfgParamAttr->pstrCfgParamVal.auth_type) == 5) {
strWIDList[u8WidCnt].id = WID_AUTH_TYPE;
- strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.auth_type;
+ strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.auth_type;
strWIDList[u8WidCnt].type = WID_CHAR;
strWIDList[u8WidCnt].size = sizeof(char);
pstrWFIDrv->strCfgValues.auth_type = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.auth_type;
@@ -916,7 +916,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
/* range is 1 to 65535. */
if (strHostIFCfgParamAttr->pstrCfgParamVal.auth_timeout > 0 && strHostIFCfgParamAttr->pstrCfgParamVal.auth_timeout < 65536) {
strWIDList[u8WidCnt].id = WID_AUTH_TIMEOUT;
- strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.auth_timeout;
+ strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.auth_timeout;
strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].size = sizeof(u16);
pstrWFIDrv->strCfgValues.auth_timeout = strHostIFCfgParamAttr->pstrCfgParamVal.auth_timeout;
@@ -937,7 +937,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
/*----------------------------------------------------------*/
if (strHostIFCfgParamAttr->pstrCfgParamVal.power_mgmt_mode < 5) {
strWIDList[u8WidCnt].id = WID_POWER_MANAGEMENT;
- strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.power_mgmt_mode;
+ strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.power_mgmt_mode;
strWIDList[u8WidCnt].type = WID_CHAR;
strWIDList[u8WidCnt].size = sizeof(char);
pstrWFIDrv->strCfgValues.power_mgmt_mode = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.power_mgmt_mode;
@@ -952,7 +952,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
/* range from 1 to 256 */
if ((strHostIFCfgParamAttr->pstrCfgParamVal.short_retry_limit > 0) && (strHostIFCfgParamAttr->pstrCfgParamVal.short_retry_limit < 256)) {
strWIDList[u8WidCnt].id = WID_SHORT_RETRY_LIMIT;
- strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.short_retry_limit;
+ strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.short_retry_limit;
strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].size = sizeof(u16);
pstrWFIDrv->strCfgValues.short_retry_limit = strHostIFCfgParamAttr->pstrCfgParamVal.short_retry_limit;
@@ -967,7 +967,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
/* range from 1 to 256 */
if ((strHostIFCfgParamAttr->pstrCfgParamVal.long_retry_limit > 0) && (strHostIFCfgParamAttr->pstrCfgParamVal.long_retry_limit < 256)) {
strWIDList[u8WidCnt].id = WID_LONG_RETRY_LIMIT;
- strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.long_retry_limit;
+ strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.long_retry_limit;
strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].size = sizeof(u16);
@@ -983,7 +983,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.frag_threshold > 255 && strHostIFCfgParamAttr->pstrCfgParamVal.frag_threshold < 7937) {
strWIDList[u8WidCnt].id = WID_FRAG_THRESHOLD;
- strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.frag_threshold;
+ strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.frag_threshold;
strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].size = sizeof(u16);
pstrWFIDrv->strCfgValues.frag_threshold = strHostIFCfgParamAttr->pstrCfgParamVal.frag_threshold;
@@ -998,7 +998,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
/* range 256 to 65535 */
if (strHostIFCfgParamAttr->pstrCfgParamVal.rts_threshold > 255 && strHostIFCfgParamAttr->pstrCfgParamVal.rts_threshold < 65536) {
strWIDList[u8WidCnt].id = WID_RTS_THRESHOLD;
- strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.rts_threshold;
+ strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.rts_threshold;
strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].size = sizeof(u16);
pstrWFIDrv->strCfgValues.rts_threshold = strHostIFCfgParamAttr->pstrCfgParamVal.rts_threshold;
@@ -1017,7 +1017,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
/*------------------------------------------------------*/
if (strHostIFCfgParamAttr->pstrCfgParamVal.preamble_type < 3) {
strWIDList[u8WidCnt].id = WID_PREAMBLE;
- strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.preamble_type;
+ strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.preamble_type;
strWIDList[u8WidCnt].type = WID_CHAR;
strWIDList[u8WidCnt].size = sizeof(char);
pstrWFIDrv->strCfgValues.preamble_type = strHostIFCfgParamAttr->pstrCfgParamVal.preamble_type;
@@ -1031,7 +1031,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
if (strHostIFCfgParamAttr->pstrCfgParamVal.u32SetCfgFlag & SHORT_SLOT_ALLOWED) {
if (strHostIFCfgParamAttr->pstrCfgParamVal.short_slot_allowed < 2) {
strWIDList[u8WidCnt].id = WID_SHORT_SLOT_ALLOWED;
- strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.short_slot_allowed;
+ strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.short_slot_allowed;
strWIDList[u8WidCnt].type = WID_CHAR;
strWIDList[u8WidCnt].size = sizeof(char);
pstrWFIDrv->strCfgValues.short_slot_allowed = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.short_slot_allowed;
@@ -1049,7 +1049,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
/*Input Values: 1 for enable and 0 for disable. */
if (strHostIFCfgParamAttr->pstrCfgParamVal.txop_prot_disabled < 2) {
strWIDList[u8WidCnt].id = WID_11N_TXOP_PROT_DISABLE;
- strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.txop_prot_disabled;
+ strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.txop_prot_disabled;
strWIDList[u8WidCnt].type = WID_CHAR;
strWIDList[u8WidCnt].size = sizeof(char);
pstrWFIDrv->strCfgValues.txop_prot_disabled = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.txop_prot_disabled;
@@ -1064,7 +1064,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
/* range is 1 to 65535. */
if (strHostIFCfgParamAttr->pstrCfgParamVal.beacon_interval > 0 && strHostIFCfgParamAttr->pstrCfgParamVal.beacon_interval < 65536) {
strWIDList[u8WidCnt].id = WID_BEACON_INTERVAL;
- strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.beacon_interval;
+ strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.beacon_interval;
strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].size = sizeof(u16);
pstrWFIDrv->strCfgValues.beacon_interval = strHostIFCfgParamAttr->pstrCfgParamVal.beacon_interval;
@@ -1079,7 +1079,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
/* range is 1 to 255. */
if (strHostIFCfgParamAttr->pstrCfgParamVal.dtim_period > 0 && strHostIFCfgParamAttr->pstrCfgParamVal.dtim_period < 256) {
strWIDList[u8WidCnt].id = WID_DTIM_PERIOD;
- strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.dtim_period;
+ strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.dtim_period;
strWIDList[u8WidCnt].type = WID_CHAR;
strWIDList[u8WidCnt].size = sizeof(char);
pstrWFIDrv->strCfgValues.dtim_period = strHostIFCfgParamAttr->pstrCfgParamVal.dtim_period;
@@ -1098,7 +1098,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
/*----------------------------------------------------------------------*/
if (strHostIFCfgParamAttr->pstrCfgParamVal.site_survey_enabled < 3) {
strWIDList[u8WidCnt].id = WID_SITE_SURVEY;
- strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.site_survey_enabled;
+ strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.site_survey_enabled;
strWIDList[u8WidCnt].type = WID_CHAR;
strWIDList[u8WidCnt].size = sizeof(char);
pstrWFIDrv->strCfgValues.site_survey_enabled = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.site_survey_enabled;
@@ -1113,7 +1113,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
/* range is 1 to 65535. */
if (strHostIFCfgParamAttr->pstrCfgParamVal.site_survey_scan_time > 0 && strHostIFCfgParamAttr->pstrCfgParamVal.site_survey_scan_time < 65536) {
strWIDList[u8WidCnt].id = WID_SITE_SURVEY_SCAN_TIME;
- strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.site_survey_scan_time;
+ strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.site_survey_scan_time;
strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].size = sizeof(u16);
pstrWFIDrv->strCfgValues.site_survey_scan_time = strHostIFCfgParamAttr->pstrCfgParamVal.site_survey_scan_time;
@@ -1128,7 +1128,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
/* range is 1 to 65535. */
if (strHostIFCfgParamAttr->pstrCfgParamVal.active_scan_time > 0 && strHostIFCfgParamAttr->pstrCfgParamVal.active_scan_time < 65536) {
strWIDList[u8WidCnt].id = WID_ACTIVE_SCAN_TIME;
- strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.active_scan_time;
+ strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.active_scan_time;
strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].size = sizeof(u16);
pstrWFIDrv->strCfgValues.active_scan_time = strHostIFCfgParamAttr->pstrCfgParamVal.active_scan_time;
@@ -1143,7 +1143,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
/* range is 1 to 65535. */
if (strHostIFCfgParamAttr->pstrCfgParamVal.passive_scan_time > 0 && strHostIFCfgParamAttr->pstrCfgParamVal.passive_scan_time < 65536) {
strWIDList[u8WidCnt].id = WID_PASSIVE_SCAN_TIME;
- strWIDList[u8WidCnt].ps8WidVal = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.passive_scan_time;
+ strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.passive_scan_time;
strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].size = sizeof(u16);
pstrWFIDrv->strCfgValues.passive_scan_time = strHostIFCfgParamAttr->pstrCfgParamVal.passive_scan_time;
@@ -1168,7 +1168,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler,
|| curr_tx_rate == MBPS_18 || curr_tx_rate == MBPS_24
|| curr_tx_rate == MBPS_36 || curr_tx_rate == MBPS_48 || curr_tx_rate == MBPS_54) {
strWIDList[u8WidCnt].id = WID_CURRENT_TX_RATE;
- strWIDList[u8WidCnt].ps8WidVal = (s8 *)&curr_tx_rate;
+ strWIDList[u8WidCnt].val = (s8 *)&curr_tx_rate;
strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].size = sizeof(u16);
pstrWFIDrv->strCfgValues.curr_tx_rate = (u8)curr_tx_rate;
@@ -1260,9 +1260,9 @@ static s32 Handle_Scan(struct host_if_drv *drvHandler,
for (i = 0; i < pstrHostIFscanAttr->strHiddenNetwork.u8ssidnum; i++)
valuesize += ((pstrHostIFscanAttr->strHiddenNetwork.pstrHiddenNetworkInfo[i].u8ssidlen) + 1);
pu8HdnNtwrksWidVal = kmalloc(valuesize + 1, GFP_KERNEL);
- strWIDList[u32WidsCount].ps8WidVal = pu8HdnNtwrksWidVal;
- if (strWIDList[u32WidsCount].ps8WidVal != NULL) {
- pu8Buffer = strWIDList[u32WidsCount].ps8WidVal;
+ strWIDList[u32WidsCount].val = pu8HdnNtwrksWidVal;
+ if (strWIDList[u32WidsCount].val != NULL) {
+ pu8Buffer = strWIDList[u32WidsCount].val;
*pu8Buffer++ = pstrHostIFscanAttr->strHiddenNetwork.u8ssidnum;
@@ -1287,7 +1287,7 @@ static s32 Handle_Scan(struct host_if_drv *drvHandler,
/* IEs to be inserted in Probe Request */
strWIDList[u32WidsCount].id = WID_INFO_ELEMENT_PROBE;
strWIDList[u32WidsCount].type = WID_BIN_DATA;
- strWIDList[u32WidsCount].ps8WidVal = pstrHostIFscanAttr->pu8IEs;
+ strWIDList[u32WidsCount].val = pstrHostIFscanAttr->pu8IEs;
strWIDList[u32WidsCount].size = pstrHostIFscanAttr->IEsLen;
u32WidsCount++;
}
@@ -1296,7 +1296,7 @@ static s32 Handle_Scan(struct host_if_drv *drvHandler,
strWIDList[u32WidsCount].id = WID_SCAN_TYPE;
strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].size = sizeof(char);
- strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrHostIFscanAttr->u8ScanType));
+ strWIDList[u32WidsCount].val = (s8 *)(&(pstrHostIFscanAttr->u8ScanType));
u32WidsCount++;
/*list of channels to be scanned*/
@@ -1312,7 +1312,7 @@ static s32 Handle_Scan(struct host_if_drv *drvHandler,
}
}
- strWIDList[u32WidsCount].ps8WidVal = pstrHostIFscanAttr->pu8ChnlFreqList;
+ strWIDList[u32WidsCount].val = pstrHostIFscanAttr->pu8ChnlFreqList;
strWIDList[u32WidsCount].size = pstrHostIFscanAttr->u8ChnlListLen;
u32WidsCount++;
@@ -1320,7 +1320,7 @@ static s32 Handle_Scan(struct host_if_drv *drvHandler,
strWIDList[u32WidsCount].id = WID_START_SCAN_REQ;
strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].size = sizeof(char);
- strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrHostIFscanAttr->u8ScanSource));
+ strWIDList[u32WidsCount].val = (s8 *)(&(pstrHostIFscanAttr->u8ScanSource));
u32WidsCount++;
/*keep the state as is , no need to change it*/
@@ -1402,7 +1402,7 @@ static s32 Handle_ScanDone(struct host_if_drv *drvHandler, tenuScanEvent enuEven
u8abort_running_scan = 1;
strWID.id = (u16)WID_ABORT_RUNNING_SCAN;
strWID.type = WID_CHAR;
- strWID.ps8WidVal = (s8 *)&u8abort_running_scan;
+ strWID.val = (s8 *)&u8abort_running_scan;
strWID.size = sizeof(char);
/*Sending Cfg*/
@@ -1499,19 +1499,19 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler,
strWIDList[u32WidsCount].id = WID_SUCCESS_FRAME_COUNT;
strWIDList[u32WidsCount].type = WID_INT;
strWIDList[u32WidsCount].size = sizeof(u32);
- strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(dummyval));
+ strWIDList[u32WidsCount].val = (s8 *)(&(dummyval));
u32WidsCount++;
strWIDList[u32WidsCount].id = WID_RECEIVED_FRAGMENT_COUNT;
strWIDList[u32WidsCount].type = WID_INT;
strWIDList[u32WidsCount].size = sizeof(u32);
- strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(dummyval));
+ strWIDList[u32WidsCount].val = (s8 *)(&(dummyval));
u32WidsCount++;
strWIDList[u32WidsCount].id = WID_FAILED_COUNT;
strWIDList[u32WidsCount].type = WID_INT;
strWIDList[u32WidsCount].size = sizeof(u32);
- strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(dummyval));
+ strWIDList[u32WidsCount].val = (s8 *)(&(dummyval));
u32WidsCount++;
/* if((gWFiDrvHandle->strWILC_UsrConnReq.pu8ConnReqIEs != NULL) && */
@@ -1520,7 +1520,7 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler,
/* IEs to be inserted in Association Request */
strWIDList[u32WidsCount].id = WID_INFO_ELEMENT_ASSOCIATE;
strWIDList[u32WidsCount].type = WID_BIN_DATA;
- strWIDList[u32WidsCount].ps8WidVal = pstrWFIDrv->strWILC_UsrConnReq.pu8ConnReqIEs;
+ strWIDList[u32WidsCount].val = pstrWFIDrv->strWILC_UsrConnReq.pu8ConnReqIEs;
strWIDList[u32WidsCount].size = pstrWFIDrv->strWILC_UsrConnReq.ConnReqIEsLen;
u32WidsCount++;
@@ -1535,7 +1535,7 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler,
strWIDList[u32WidsCount].id = (u16)WID_11I_MODE;
strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].size = sizeof(char);
- strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrWFIDrv->strWILC_UsrConnReq.u8security));
+ strWIDList[u32WidsCount].val = (s8 *)(&(pstrWFIDrv->strWILC_UsrConnReq.u8security));
u32WidsCount++;
if (memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7))
@@ -1547,7 +1547,7 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler,
strWIDList[u32WidsCount].id = (u16)WID_AUTH_TYPE;
strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].size = sizeof(char);
- strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&pstrWFIDrv->strWILC_UsrConnReq.tenuAuth_type);
+ strWIDList[u32WidsCount].val = (s8 *)(&pstrWFIDrv->strWILC_UsrConnReq.tenuAuth_type);
u32WidsCount++;
if (memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7))
@@ -1570,18 +1570,18 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler,
/*Sending NoA attributes during connection*/
strWIDList[u32WidsCount].size = 112; /* 79; */
- strWIDList[u32WidsCount].ps8WidVal = kmalloc(strWIDList[u32WidsCount].size, GFP_KERNEL);
+ strWIDList[u32WidsCount].val = kmalloc(strWIDList[u32WidsCount].size, GFP_KERNEL);
if (memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7)) {
gu32FlushedJoinReqSize = strWIDList[u32WidsCount].size;
gu8FlushedJoinReq = kmalloc(gu32FlushedJoinReqSize, GFP_KERNEL);
}
- if (strWIDList[u32WidsCount].ps8WidVal == NULL) {
+ if (strWIDList[u32WidsCount].val == NULL) {
s32Error = -EFAULT;
goto ERRORHANDLER;
}
- pu8CurrByte = strWIDList[u32WidsCount].ps8WidVal;
+ pu8CurrByte = strWIDList[u32WidsCount].val;
if (pstrHostIFconnectAttr->pu8ssid != NULL) {
@@ -1693,7 +1693,7 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler,
PRINT_D(HOSTINF_DBG, "NOA not present\n");
/* keep the buffer at the start of the allocated pointer to use it with the free*/
- pu8CurrByte = strWIDList[u32WidsCount].ps8WidVal;
+ pu8CurrByte = strWIDList[u32WidsCount].val;
u32WidsCount++;
/* A temporary workaround to avoid handling the misleading MAC_DISCONNECTED raised from the
@@ -1814,14 +1814,14 @@ static s32 Handle_FlushConnect(struct host_if_drv *drvHandler)
/* IEs to be inserted in Association Request */
strWIDList[u32WidsCount].id = WID_INFO_ELEMENT_ASSOCIATE;
strWIDList[u32WidsCount].type = WID_BIN_DATA;
- strWIDList[u32WidsCount].ps8WidVal = gu8FlushedInfoElemAsoc;
+ strWIDList[u32WidsCount].val = gu8FlushedInfoElemAsoc;
strWIDList[u32WidsCount].size = gu32FlushedInfoElemAsocSize;
u32WidsCount++;
strWIDList[u32WidsCount].id = (u16)WID_11I_MODE;
strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].size = sizeof(char);
- strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(gu8Flushed11iMode));
+ strWIDList[u32WidsCount].val = (s8 *)(&(gu8Flushed11iMode));
u32WidsCount++;
@@ -1829,14 +1829,14 @@ static s32 Handle_FlushConnect(struct host_if_drv *drvHandler)
strWIDList[u32WidsCount].id = (u16)WID_AUTH_TYPE;
strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].size = sizeof(char);
- strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&gu8FlushedAuthType);
+ strWIDList[u32WidsCount].val = (s8 *)(&gu8FlushedAuthType);
u32WidsCount++;
strWIDList[u32WidsCount].id = (u16)WID_JOIN_REQ_EXTENDED;
strWIDList[u32WidsCount].type = WID_STR;
strWIDList[u32WidsCount].size = gu32FlushedJoinReqSize;
- strWIDList[u32WidsCount].ps8WidVal = (s8 *)gu8FlushedJoinReq;
- pu8CurrByte = strWIDList[u32WidsCount].ps8WidVal;
+ strWIDList[u32WidsCount].val = (s8 *)gu8FlushedJoinReq;
+ pu8CurrByte = strWIDList[u32WidsCount].val;
pu8CurrByte += FLUSHED_BYTE_POS;
*(pu8CurrByte) = FLUSHED_JOIN_REQ;
@@ -1919,7 +1919,7 @@ static s32 Handle_ConnectTimeout(struct host_if_drv *drvHandler)
* WID_DISCONNECT} */
strWID.id = (u16)WID_DISCONNECT;
strWID.type = WID_CHAR;
- strWID.ps8WidVal = (s8 *)&u16DummyReasonCode;
+ strWID.val = (s8 *)&u16DummyReasonCode;
strWID.size = sizeof(char);
PRINT_D(HOSTINF_DBG, "Sending disconnect request\n");
@@ -2427,17 +2427,17 @@ static int Handle_Key(struct host_if_drv *drvHandler,
strWIDList[0].id = (u16)WID_11I_MODE;
strWIDList[0].type = WID_CHAR;
strWIDList[0].size = sizeof(char);
- strWIDList[0].ps8WidVal = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8mode));
+ strWIDList[0].val = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8mode));
strWIDList[1].id = WID_AUTH_TYPE;
strWIDList[1].type = WID_CHAR;
strWIDList[1].size = sizeof(char);
- strWIDList[1].ps8WidVal = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.tenuAuth_type));
+ strWIDList[1].val = (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].val = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx));
strWIDList[2].size = sizeof(char);
@@ -2458,7 +2458,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].size = pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8WepKeylen;
- strWIDList[3].ps8WidVal = (s8 *)pu8keybuf;
+ strWIDList[3].val = (s8 *)pu8keybuf;
s32Error = send_config_pkt(SET_CFG, strWIDList, 4,
@@ -2486,7 +2486,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.val = (s8 *)pu8keybuf;
strWID.size = pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8WepKeylen + 2;
s32Error = send_config_pkt(SET_CFG, &strWID, 1,
@@ -2499,7 +2499,7 @@ static int Handle_Key(struct host_if_drv *drvHandler,
strWID.type = WID_STR;
s8idxarray[0] = (s8)pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx;
- strWID.ps8WidVal = s8idxarray;
+ strWID.val = s8idxarray;
strWID.size = 1;
s32Error = send_config_pkt(SET_CFG, &strWID, 1,
@@ -2507,7 +2507,7 @@ static int Handle_Key(struct host_if_drv *drvHandler,
} else {
strWID.id = (u16)WID_KEY_ID;
strWID.type = WID_CHAR;
- strWID.ps8WidVal = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx));
+ strWID.val = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx));
strWID.size = sizeof(char);
PRINT_D(HOSTINF_DBG, "Setting default key index\n");
@@ -2551,11 +2551,11 @@ static int Handle_Key(struct host_if_drv *drvHandler,
strWIDList[0].id = (u16)WID_11I_MODE;
strWIDList[0].type = WID_CHAR;
strWIDList[0].size = sizeof(char);
- strWIDList[0].ps8WidVal = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwpaAttr.u8Ciphermode));
+ strWIDList[0].val = (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].val = (s8 *)pu8keybuf;
strWIDList[1].size = RX_MIC_KEY_MSG_LEN;
s32Error = send_config_pkt(SET_CFG, strWIDList, 2,
@@ -2601,7 +2601,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.val = (s8 *)pu8keybuf;
strWID.size = RX_MIC_KEY_MSG_LEN;
s32Error = send_config_pkt(SET_CFG, &strWID, 1,
@@ -2654,11 +2654,11 @@ _WPARxGtk_end_case_:
strWIDList[0].id = (u16)WID_11I_MODE;
strWIDList[0].type = WID_CHAR;
strWIDList[0].size = sizeof(char);
- strWIDList[0].ps8WidVal = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwpaAttr.u8Ciphermode));
+ strWIDList[0].val = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwpaAttr.u8Ciphermode));
strWIDList[1].id = (u16)WID_ADD_PTK;
strWIDList[1].type = WID_STR;
- strWIDList[1].ps8WidVal = (s8 *)pu8keybuf;
+ strWIDList[1].val = (s8 *)pu8keybuf;
strWIDList[1].size = PTK_KEY_MSG_LEN + 1;
s32Error = send_config_pkt(SET_CFG, strWIDList, 2,
@@ -2699,7 +2699,7 @@ _WPARxGtk_end_case_:
strWID.id = (u16)WID_ADD_PTK;
strWID.type = WID_STR;
- strWID.ps8WidVal = (s8 *)pu8keybuf;
+ strWID.val = (s8 *)pu8keybuf;
strWID.size = PTK_KEY_MSG_LEN;
s32Error = send_config_pkt(SET_CFG, &strWID, 1,
@@ -2739,7 +2739,7 @@ _WPAPtk_end_case_:
strWID.id = (u16)WID_PMKID_INFO;
strWID.type = WID_STR;
- strWID.ps8WidVal = (s8 *)pu8keybuf;
+ strWID.val = (s8 *)pu8keybuf;
strWID.size = (pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFpmkidAttr.numpmkid * PMKSA_KEY_LEN) + 1;
s32Error = send_config_pkt(SET_CFG, &strWID, 1,
@@ -2777,7 +2777,7 @@ static void Handle_Disconnect(struct host_if_drv *drvHandler)
strWID.id = (u16)WID_DISCONNECT;
strWID.type = WID_CHAR;
- strWID.ps8WidVal = (s8 *)&u16DummyReasonCode;
+ strWID.val = (s8 *)&u16DummyReasonCode;
strWID.size = sizeof(char);
@@ -2901,7 +2901,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.val = (s8 *)&gu8Chnl;
strWID.size = sizeof(char);
PRINT_D(HOSTINF_DBG, "Getting channel value\n");
@@ -2940,7 +2940,7 @@ static void Handle_GetRssi(struct host_if_drv *drvHandler)
strWID.id = (u16)WID_RSSI;
strWID.type = WID_CHAR;
- strWID.ps8WidVal = &gs8Rssi;
+ strWID.val = &gs8Rssi;
strWID.size = sizeof(char);
/*Sending Cfg*/
@@ -2969,7 +2969,7 @@ static void Handle_GetLinkspeed(struct host_if_drv *drvHandler)
strWID.id = (u16)WID_LINKSPEED;
strWID.type = WID_CHAR;
- strWID.ps8WidVal = &gs8lnkspd;
+ strWID.val = &gs8lnkspd;
strWID.size = sizeof(char);
/*Sending Cfg*/
PRINT_D(HOSTINF_DBG, "Getting LINKSPEED value\n");
@@ -2994,31 +2994,31 @@ s32 Handle_GetStatistics(struct host_if_drv *drvHandler, tstrStatistics *pstrSta
strWIDList[u32WidsCount].id = WID_LINKSPEED;
strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].size = sizeof(char);
- strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrStatistics->u8LinkSpeed));
+ strWIDList[u32WidsCount].val = (s8 *)(&(pstrStatistics->u8LinkSpeed));
u32WidsCount++;
strWIDList[u32WidsCount].id = WID_RSSI;
strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].size = sizeof(char);
- strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrStatistics->s8RSSI));
+ strWIDList[u32WidsCount].val = (s8 *)(&(pstrStatistics->s8RSSI));
u32WidsCount++;
strWIDList[u32WidsCount].id = WID_SUCCESS_FRAME_COUNT;
strWIDList[u32WidsCount].type = WID_INT;
strWIDList[u32WidsCount].size = sizeof(u32);
- strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrStatistics->u32TxCount));
+ strWIDList[u32WidsCount].val = (s8 *)(&(pstrStatistics->u32TxCount));
u32WidsCount++;
strWIDList[u32WidsCount].id = WID_RECEIVED_FRAGMENT_COUNT;
strWIDList[u32WidsCount].type = WID_INT;
strWIDList[u32WidsCount].size = sizeof(u32);
- strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrStatistics->u32RxCount));
+ strWIDList[u32WidsCount].val = (s8 *)(&(pstrStatistics->u32RxCount));
u32WidsCount++;
strWIDList[u32WidsCount].id = WID_FAILED_COUNT;
strWIDList[u32WidsCount].type = WID_INT;
strWIDList[u32WidsCount].size = sizeof(u32);
- strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrStatistics->u32TxFailureCount));
+ strWIDList[u32WidsCount].val = (s8 *)(&(pstrStatistics->u32TxFailureCount));
u32WidsCount++;
s32Error = send_config_pkt(GET_CFG, strWIDList, u32WidsCount,
@@ -3056,10 +3056,10 @@ static s32 Handle_Get_InActiveTime(struct host_if_drv *drvHandler,
strWID.id = (u16)WID_SET_STA_MAC_INACTIVE_TIME;
strWID.type = WID_STR;
strWID.size = ETH_ALEN;
- strWID.ps8WidVal = kmalloc(strWID.size, GFP_KERNEL);
+ strWID.val = kmalloc(strWID.size, GFP_KERNEL);
- stamac = strWID.ps8WidVal;
+ stamac = strWID.val;
memcpy(stamac, strHostIfStaInactiveT->mac, ETH_ALEN);
@@ -3077,7 +3077,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.val = (s8 *)&gu32InactiveTime;
strWID.size = sizeof(u32);
@@ -3123,11 +3123,11 @@ static void Handle_AddBeacon(struct host_if_drv *drvHandler,
strWID.id = (u16)WID_ADD_BEACON;
strWID.type = WID_BIN;
strWID.size = pstrSetBeaconParam->u32HeadLen + pstrSetBeaconParam->u32TailLen + 16;
- strWID.ps8WidVal = kmalloc(strWID.size, GFP_KERNEL);
- if (strWID.ps8WidVal == NULL)
+ strWID.val = kmalloc(strWID.size, GFP_KERNEL);
+ if (strWID.val == NULL)
goto ERRORHANDLER;
- pu8CurrByte = strWID.ps8WidVal;
+ pu8CurrByte = strWID.val;
*pu8CurrByte++ = (pstrSetBeaconParam->u32Interval & 0xFF);
*pu8CurrByte++ = ((pstrSetBeaconParam->u32Interval >> 8) & 0xFF);
*pu8CurrByte++ = ((pstrSetBeaconParam->u32Interval >> 16) & 0xFF);
@@ -3164,7 +3164,7 @@ static void Handle_AddBeacon(struct host_if_drv *drvHandler,
PRINT_ER("Failed to send add beacon config packet\n");
ERRORHANDLER:
- kfree(strWID.ps8WidVal);
+ kfree(strWID.val);
kfree(pstrSetBeaconParam->pu8Head);
kfree(pstrSetBeaconParam->pu8Tail);
}
@@ -3189,12 +3189,12 @@ static void Handle_DelBeacon(struct host_if_drv *drvHandler)
strWID.id = (u16)WID_DEL_BEACON;
strWID.type = WID_CHAR;
strWID.size = sizeof(char);
- strWID.ps8WidVal = &gu8DelBcn;
+ strWID.val = &gu8DelBcn;
- if (strWID.ps8WidVal == NULL)
+ if (strWID.val == NULL)
return;
- pu8CurrByte = strWID.ps8WidVal;
+ pu8CurrByte = strWID.val;
PRINT_D(HOSTINF_DBG, "Deleting BEACON\n");
/* TODO: build del beacon message*/
@@ -3284,11 +3284,11 @@ static void Handle_AddStation(struct host_if_drv *drvHandler,
strWID.type = WID_BIN;
strWID.size = WILC_ADD_STA_LENGTH + pstrStationParam->u8NumRates;
- strWID.ps8WidVal = kmalloc(strWID.size, GFP_KERNEL);
- if (strWID.ps8WidVal == NULL)
+ strWID.val = kmalloc(strWID.size, GFP_KERNEL);
+ if (strWID.val == NULL)
goto ERRORHANDLER;
- pu8CurrByte = strWID.ps8WidVal;
+ pu8CurrByte = strWID.val;
pu8CurrByte += WILC_HostIf_PackStaParam(pu8CurrByte, pstrStationParam);
/*Sending Cfg*/
@@ -3299,7 +3299,7 @@ static void Handle_AddStation(struct host_if_drv *drvHandler,
ERRORHANDLER:
kfree(pstrStationParam->pu8Rates);
- kfree(strWID.ps8WidVal);
+ kfree(strWID.val);
}
/**
@@ -3328,11 +3328,11 @@ static void Handle_DelAllSta(struct host_if_drv *drvHandler,
PRINT_D(HOSTINF_DBG, "Handling delete station\n");
- strWID.ps8WidVal = kmalloc((pstrDelAllStaParam->u8Num_AssocSta * ETH_ALEN) + 1, GFP_KERNEL);
- if (strWID.ps8WidVal == NULL)
+ strWID.val = kmalloc((pstrDelAllStaParam->u8Num_AssocSta * ETH_ALEN) + 1, GFP_KERNEL);
+ if (strWID.val == NULL)
goto ERRORHANDLER;
- pu8CurrByte = strWID.ps8WidVal;
+ pu8CurrByte = strWID.val;
*(pu8CurrByte++) = pstrDelAllStaParam->u8Num_AssocSta;
@@ -3352,7 +3352,7 @@ static void Handle_DelAllSta(struct host_if_drv *drvHandler,
PRINT_ER("Failed to send add station config packet\n");
ERRORHANDLER:
- kfree(strWID.ps8WidVal);
+ kfree(strWID.val);
up(&hWaitResponse);
}
@@ -3381,11 +3381,11 @@ static void Handle_DelStation(struct host_if_drv *drvHandler,
PRINT_D(HOSTINF_DBG, "Handling delete station\n");
- strWID.ps8WidVal = kmalloc(strWID.size, GFP_KERNEL);
- if (strWID.ps8WidVal == NULL)
+ strWID.val = kmalloc(strWID.size, GFP_KERNEL);
+ if (strWID.val == NULL)
goto ERRORHANDLER;
- pu8CurrByte = strWID.ps8WidVal;
+ pu8CurrByte = strWID.val;
memcpy(pu8CurrByte, pstrDelStaParam->au8MacAddr, ETH_ALEN);
@@ -3396,7 +3396,7 @@ static void Handle_DelStation(struct host_if_drv *drvHandler,
PRINT_ER("Failed to send add station config packet\n");
ERRORHANDLER:
- kfree(strWID.ps8WidVal);
+ kfree(strWID.val);
}
@@ -3422,11 +3422,11 @@ static void Handle_EditStation(struct host_if_drv *drvHandler,
strWID.size = WILC_ADD_STA_LENGTH + pstrStationParam->u8NumRates;
PRINT_D(HOSTINF_DBG, "Handling edit station\n");
- strWID.ps8WidVal = kmalloc(strWID.size, GFP_KERNEL);
- if (strWID.ps8WidVal == NULL)
+ strWID.val = kmalloc(strWID.size, GFP_KERNEL);
+ if (strWID.val == NULL)
goto ERRORHANDLER;
- pu8CurrByte = strWID.ps8WidVal;
+ pu8CurrByte = strWID.val;
pu8CurrByte += WILC_HostIf_PackStaParam(pu8CurrByte, pstrStationParam);
/*Sending Cfg*/
@@ -3437,7 +3437,7 @@ static void Handle_EditStation(struct host_if_drv *drvHandler,
ERRORHANDLER:
kfree(pstrStationParam->pu8Rates);
- kfree(strWID.ps8WidVal);
+ kfree(strWID.val);
}
/**
@@ -3493,15 +3493,15 @@ static int Handle_RemainOnChan(struct host_if_drv *drvHandler,
strWID.id = (u16)WID_REMAIN_ON_CHAN;
strWID.type = WID_STR;
strWID.size = 2;
- strWID.ps8WidVal = kmalloc(strWID.size, GFP_KERNEL);
+ strWID.val = kmalloc(strWID.size, GFP_KERNEL);
- if (strWID.ps8WidVal == NULL) {
+ if (strWID.val == NULL) {
s32Error = -ENOMEM;
goto ERRORHANDLER;
}
- strWID.ps8WidVal[0] = u8remain_on_chan_flag;
- strWID.ps8WidVal[1] = (s8)pstrHostIfRemainOnChan->u16Channel;
+ strWID.val[0] = u8remain_on_chan_flag;
+ strWID.val[1] = (s8)pstrHostIfRemainOnChan->u16Channel;
/*Sending Cfg*/
s32Error = send_config_pkt(SET_CFG, &strWID, 1,
@@ -3549,11 +3549,11 @@ static int Handle_RegisterFrame(struct host_if_drv *drvHandler,
/*prepare configuration packet*/
strWID.id = (u16)WID_REGISTER_FRAME;
strWID.type = WID_STR;
- strWID.ps8WidVal = kmalloc(sizeof(u16) + 2, GFP_KERNEL);
- if (strWID.ps8WidVal == NULL)
+ strWID.val = kmalloc(sizeof(u16) + 2, GFP_KERNEL);
+ if (strWID.val == NULL)
return -ENOMEM;
- pu8CurrByte = strWID.ps8WidVal;
+ pu8CurrByte = strWID.val;
*pu8CurrByte++ = pstrHostIfRegisterFrame->bReg;
*pu8CurrByte++ = pstrHostIfRegisterFrame->u8Regid;
@@ -3602,13 +3602,13 @@ static u32 Handle_ListenStateExpired(struct host_if_drv *drvHandler,
strWID.id = (u16)WID_REMAIN_ON_CHAN;
strWID.type = WID_STR;
strWID.size = 2;
- strWID.ps8WidVal = kmalloc(strWID.size, GFP_KERNEL);
+ strWID.val = kmalloc(strWID.size, GFP_KERNEL);
- if (strWID.ps8WidVal == NULL)
+ if (strWID.val == NULL)
PRINT_ER("Failed to allocate memory\n");
- strWID.ps8WidVal[0] = u8remain_on_chan_flag;
- strWID.ps8WidVal[1] = FALSE_FRMWR_CHANNEL;
+ strWID.val[0] = u8remain_on_chan_flag;
+ strWID.val[1] = FALSE_FRMWR_CHANNEL;
/*Sending Cfg*/
s32Error = send_config_pkt(SET_CFG, &strWID, 1,
@@ -3686,7 +3686,7 @@ static void Handle_PowerManagement(struct host_if_drv *drvHandler,
else
s8PowerMode = NO_POWERSAVE;
PRINT_D(HOSTINF_DBG, "Handling power mgmt to %d\n", s8PowerMode);
- strWID.ps8WidVal = &s8PowerMode;
+ strWID.val = &s8PowerMode;
strWID.size = sizeof(char);
PRINT_D(HOSTINF_DBG, "Handling Power Management\n");
@@ -3719,11 +3719,11 @@ static void Handle_SetMulticastFilter(struct host_if_drv *drvHandler,
strWID.id = (u16)WID_SETUP_MULTICAST_FILTER;
strWID.type = WID_BIN;
strWID.size = sizeof(struct set_multicast) + ((strHostIfSetMulti->u32count) * ETH_ALEN);
- strWID.ps8WidVal = kmalloc(strWID.size, GFP_KERNEL);
- if (strWID.ps8WidVal == NULL)
+ strWID.val = kmalloc(strWID.size, GFP_KERNEL);
+ if (strWID.val == NULL)
goto ERRORHANDLER;
- pu8CurrByte = strWID.ps8WidVal;
+ pu8CurrByte = strWID.val;
*pu8CurrByte++ = (strHostIfSetMulti->bIsEnabled & 0xFF);
*pu8CurrByte++ = ((strHostIfSetMulti->bIsEnabled >> 8) & 0xFF);
*pu8CurrByte++ = ((strHostIfSetMulti->bIsEnabled >> 16) & 0xFF);
@@ -3744,7 +3744,7 @@ static void Handle_SetMulticastFilter(struct host_if_drv *drvHandler,
PRINT_ER("Failed to send setup multicast config packet\n");
ERRORHANDLER:
- kfree(strWID.ps8WidVal);
+ kfree(strWID.val);
}
@@ -3777,9 +3777,9 @@ 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.val = kmalloc(BLOCK_ACK_REQ_SIZE, GFP_KERNEL);
strWID.size = BLOCK_ACK_REQ_SIZE;
- ptr = strWID.ps8WidVal;
+ ptr = strWID.val;
/* *ptr++ = 0x14; */
*ptr++ = 0x14;
*ptr++ = 0x3;
@@ -3812,7 +3812,7 @@ static s32 Handle_AddBASession(struct host_if_drv *drvHandler,
strWID.id = (u16)WID_11E_P_ACTION_REQ;
strWID.type = WID_STR;
strWID.size = 15;
- ptr = strWID.ps8WidVal;
+ ptr = strWID.val;
/* *ptr++ = 0x14; */
*ptr++ = 15;
*ptr++ = 7;
@@ -3831,8 +3831,8 @@ static s32 Handle_AddBASession(struct host_if_drv *drvHandler,
s32Error = send_config_pkt(SET_CFG, &strWID, 1,
get_id_from_handler(pstrWFIDrv));
- if (strWID.ps8WidVal != NULL)
- kfree(strWID.ps8WidVal);
+ if (strWID.val != NULL)
+ kfree(strWID.val);
return s32Error;
@@ -3863,9 +3863,9 @@ 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.val = kmalloc(BLOCK_ACK_REQ_SIZE, GFP_KERNEL);
strWID.size = BLOCK_ACK_REQ_SIZE;
- ptr = strWID.ps8WidVal;
+ ptr = strWID.val;
*ptr++ = 0x14;
*ptr++ = 0x3;
*ptr++ = 0x2;
@@ -3883,8 +3883,8 @@ static s32 Handle_DelAllRxBASessions(struct host_if_drv *drvHandler,
PRINT_D(HOSTINF_DBG, "Couldn't delete BA Session\n");
- if (strWID.ps8WidVal != NULL)
- kfree(strWID.ps8WidVal);
+ if (strWID.val != NULL)
+ kfree(strWID.val);
up(&hWaitResponse);
@@ -4162,7 +4162,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.val = (s8 *)pu8StaAddress;
strWID.size = 6;
return 0;
@@ -4685,7 +4685,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.size = u32PmkidInfoLen;
- strWID.ps8WidVal = pu8PmkidInfoArray;
+ strWID.val = pu8PmkidInfoArray;
return 0;
}
@@ -4713,7 +4713,7 @@ s32 host_int_set_RSNAConfigPSKPassPhrase(struct host_if_drv *hWFIDrv, u8 *pu8Pas
if ((u8Psklength > 7) && (u8Psklength < 65)) {
strWID.id = (u16)WID_11I_PSK;
strWID.type = WID_STR;
- strWID.ps8WidVal = pu8PassPhrase;
+ strWID.val = pu8PassPhrase;
strWID.size = u8Psklength;
}
@@ -4807,7 +4807,7 @@ s32 host_int_get_RSNAConfigPSKPassPhrase(struct host_if_drv *hWFIDrv,
strWID.id = (u16)WID_11I_PSK;
strWID.type = WID_STR;
strWID.size = u8Psklength;
- strWID.ps8WidVal = pu8PassPhrase;
+ strWID.val = pu8PassPhrase;
return 0;
}
@@ -4833,7 +4833,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.val = (s8 *)&scanSource;
strWID.size = sizeof(char);
return 0;
@@ -4861,7 +4861,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.val = (s8 *)pu8ScanSource;
strWID.size = sizeof(char);
return 0;
@@ -5058,7 +5058,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.val = (s8 *)&assoc_id;
strWID.size = sizeof(char);
return 0;
@@ -5097,7 +5097,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.val = pu8AssocReqInfo;
strWID.size = u32AssocReqInfoLen;
return 0;
@@ -5128,7 +5128,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.val = pu8AssocRespInfo;
strWID.size = u32MaxAssocRespInfoLen;
@@ -5168,7 +5168,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.val = pu8RxPowerLevel;
strWID.size = u32RxPowerLevelLen;
return 0;
@@ -5358,7 +5358,7 @@ s32 host_int_test_set_int_wid(struct host_if_drv *hWFIDrv, u32 u32TestMemAddr)
/*prepare configuration packet*/
strWID.id = (u16)WID_MEMORY_ADDRESS;
strWID.type = WID_INT;
- strWID.ps8WidVal = (char *)&u32TestMemAddr;
+ strWID.val = (char *)&u32TestMemAddr;
strWID.size = sizeof(u32);
/*Sending Cfg*/
@@ -5443,7 +5443,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.val = (s8 *)pu32TestMemAddr;
strWID.size = sizeof(u32);
s32Error = send_config_pkt(GET_CFG, &strWID, 1,
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 07/10] staging: wilc1000: remove unused struct tstrWidJoinReqExt
2015-10-06 9:42 [PATCH 01/10] staging: wilc1000: remove typedef from tstrWID Tony Cho
` (4 preceding siblings ...)
2015-10-06 9:42 ` [PATCH 06/10] staging: wilc1000: rename the member variable, ps8WidVal " Tony Cho
@ 2015-10-06 9:42 ` Tony Cho
2015-10-06 9:42 ` [PATCH 08/10] staging: wilc1000: remove unused struct tstrBssTable Tony Cho
` (3 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Tony Cho @ 2015-10-06 9:42 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
From: Leo Kim <leo.kim@atmel.com>
This patch removes struct tstrWidJoinReqExt because it's not used.
Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 61728da..b70ac6b 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -405,12 +405,6 @@ struct host_if_msg {
struct host_if_drv *drv;
};
-typedef struct _tstrWidJoinReqExt {
- char SSID[MAX_SSID_LEN];
- u8 u8channel;
- u8 BSSID[6];
-} tstrWidJoinReqExt;
-
/*Struct containg joinParam of each AP*/
typedef struct _tstrJoinBssParam {
BSSTYPE_T bss_type;
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 08/10] staging: wilc1000: remove unused struct tstrBssTable
2015-10-06 9:42 [PATCH 01/10] staging: wilc1000: remove typedef from tstrWID Tony Cho
` (5 preceding siblings ...)
2015-10-06 9:42 ` [PATCH 07/10] staging: wilc1000: remove unused struct tstrWidJoinReqExt Tony Cho
@ 2015-10-06 9:42 ` Tony Cho
2015-10-06 9:42 ` [PATCH 09/10] staging: wilc1000: remove typedef from tstrJoinBssParam Tony Cho
` (2 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Tony Cho @ 2015-10-06 9:42 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
From: Leo Kim <leo.kim@atmel.com>
This patch removes struct tstrBssTable with related comment.
Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index b70ac6b..84d109f 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -435,12 +435,6 @@ typedef struct _tstrJoinBssParam {
u8 au8Interval[4];
u8 au8StartTime[4];
} tstrJoinBssParam;
-/*a linked list table containing needed join parameters entries for each AP found in most recent scan*/
-typedef struct _tstrBssTable {
- u8 u8noBssEntries;
- tstrJoinBssParam *head;
- tstrJoinBssParam *tail;
-} tstrBssTable;
typedef enum {
SCAN_TIMER = 0,
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 09/10] staging: wilc1000: remove typedef from tstrJoinBssParam
2015-10-06 9:42 [PATCH 01/10] staging: wilc1000: remove typedef from tstrWID Tony Cho
` (6 preceding siblings ...)
2015-10-06 9:42 ` [PATCH 08/10] staging: wilc1000: remove unused struct tstrBssTable Tony Cho
@ 2015-10-06 9:42 ` Tony Cho
2015-10-06 9:42 ` [PATCH 10/10] staging: wilc1000: remove _tstrJoinParam from join_bss_param Tony Cho
2015-10-08 10:00 ` [PATCH 01/10] staging: wilc1000: remove typedef from tstrWID Greg KH
9 siblings, 0 replies; 13+ messages in thread
From: Tony Cho @ 2015-10-06 9:42 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
From: Leo Kim <leo.kim@atmel.com>
This patch removes typedef from the struct tstrJoinBssParam
and renames it to join_bss_param.
Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 84d109f..cbb17cd 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -406,7 +406,7 @@ struct host_if_msg {
};
/*Struct containg joinParam of each AP*/
-typedef struct _tstrJoinBssParam {
+struct join_bss_param {
BSSTYPE_T bss_type;
u8 dtim_period;
u16 beacon_period;
@@ -434,7 +434,7 @@ typedef struct _tstrJoinBssParam {
u8 au8Duration[4];
u8 au8Interval[4];
u8 au8StartTime[4];
-} tstrJoinBssParam;
+};
typedef enum {
SCAN_TIMER = 0,
@@ -1437,7 +1437,7 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler,
u32 u32WidsCount = 0, dummyval = 0;
/* char passphrase[] = "12345678"; */
u8 *pu8CurrByte = NULL;
- tstrJoinBssParam *ptstrJoinBssParam;
+ struct join_bss_param *ptstrJoinBssParam;
PRINT_D(GENERIC_DBG, "Handling connect request\n");
@@ -1452,7 +1452,7 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler,
PRINT_INFO(HOSTINF_DBG, "Saving connection parameters in global structure\n");
- ptstrJoinBssParam = (tstrJoinBssParam *)pstrHostIFconnectAttr->pJoinParams;
+ ptstrJoinBssParam = (struct join_bss_param *)pstrHostIFconnectAttr->pJoinParams;
if (ptstrJoinBssParam == NULL) {
PRINT_ER("Required BSSID not found\n");
s32Error = -ENOENT;
@@ -6753,7 +6753,7 @@ s32 host_int_setup_multicast_filter(struct host_if_drv *hWFIDrv, bool bIsEnabled
* @version 1.0**/
static void *host_int_ParseJoinBssParam(tstrNetworkInfo *ptstrNetworkInfo)
{
- tstrJoinBssParam *pNewJoinBssParam = NULL;
+ struct join_bss_param *pNewJoinBssParam = NULL;
u8 *pu8IEs;
u16 u16IEsLen;
u16 index = 0;
@@ -6769,9 +6769,9 @@ static void *host_int_ParseJoinBssParam(tstrNetworkInfo *ptstrNetworkInfo)
pu8IEs = ptstrNetworkInfo->pu8IEs;
u16IEsLen = ptstrNetworkInfo->u16IEsLen;
- pNewJoinBssParam = kmalloc(sizeof(tstrJoinBssParam), GFP_KERNEL);
+ pNewJoinBssParam = kmalloc(sizeof(struct join_bss_param), GFP_KERNEL);
if (pNewJoinBssParam != NULL) {
- memset(pNewJoinBssParam, 0, sizeof(tstrJoinBssParam));
+ memset(pNewJoinBssParam, 0, sizeof(struct join_bss_param));
pNewJoinBssParam->dtim_period = ptstrNetworkInfo->u8DtimPeriod;
pNewJoinBssParam->beacon_period = ptstrNetworkInfo->u16BeaconPeriod;
pNewJoinBssParam->cap_info = ptstrNetworkInfo->u16CapInfo;
@@ -6955,8 +6955,8 @@ static void *host_int_ParseJoinBssParam(tstrNetworkInfo *ptstrNetworkInfo)
void host_int_freeJoinParams(void *pJoinParams)
{
- if ((tstrJoinBssParam *)pJoinParams != NULL)
- kfree((tstrJoinBssParam *)pJoinParams);
+ if ((struct bss_param *)pJoinParams != NULL)
+ kfree((struct bss_param *)pJoinParams);
else
PRINT_ER("Unable to FREE null pointer\n");
}
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 10/10] staging: wilc1000: remove _tstrJoinParam from join_bss_param
2015-10-06 9:42 [PATCH 01/10] staging: wilc1000: remove typedef from tstrWID Tony Cho
` (7 preceding siblings ...)
2015-10-06 9:42 ` [PATCH 09/10] staging: wilc1000: remove typedef from tstrJoinBssParam Tony Cho
@ 2015-10-06 9:42 ` Tony Cho
2015-10-08 10:00 ` [PATCH 01/10] staging: wilc1000: remove typedef from tstrWID Greg KH
9 siblings, 0 replies; 13+ messages in thread
From: Tony Cho @ 2015-10-06 9:42 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, johnny.kim, chris.park, rachel.kim,
tony.cho, glen.lee, leo.kim, austin.shin, adel.noureldin,
adham.abozaeid, Nicolas.FERRE
From: Leo Kim <leo.kim@atmel.com>
This patch removes struct _tstrJoinParam from the struct join_bss_param
because it is not used inside the struct.
Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index cbb17cd..c370e8d 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -424,7 +424,6 @@ struct join_bss_param {
u8 rsn_pcip_policy[3];
u8 rsn_auth_policy[3];
u8 rsn_cap[2];
- struct _tstrJoinParam *nextJoinBss;
u32 tsf;
u8 u8NoaEnbaled;
u8 u8OppEnable;
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 02/10] staging: wilc1000: remove typedef from tenuWIDtype
2015-10-06 9:42 ` [PATCH 02/10] staging: wilc1000: remove typedef from tenuWIDtype Tony Cho
@ 2015-10-06 15:14 ` Mike Rapoport
2015-10-07 5:30 ` Tony Cho
0 siblings, 1 reply; 13+ messages in thread
From: Mike Rapoport @ 2015-10-06 15:14 UTC (permalink / raw)
To: Tony Cho
Cc: gregkh, devel, rachel.kim, chris.park, austin.shin,
linux-wireless, johnny.kim, Nicolas.FERRE, adel.noureldin,
leo.kim, adham.abozaeid
On Tue, Oct 06, 2015 at 06:42:13PM +0900, Tony Cho wrote:
> From: Leo Kim <leo.kim@atmel.com>
>
> This patch remove typedef from the enum tenuWIDtype
> and rename it to WID_TYPE.
>
> Signed-off-by: Leo Kim <leo.kim@atmel.com>
> Signed-off-by: Tony Cho <tony.cho@atmel.com>
> ---
> drivers/staging/wilc1000/coreconfigurator.h | 2 +-
> drivers/staging/wilc1000/host_interface.h | 2 +-
> drivers/staging/wilc1000/wilc_wlan_if.h | 5 ++---
> 3 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h
> index 306efc9..02faf58 100644
[ snip ]
> diff --git a/drivers/staging/wilc1000/wilc_wlan_if.h b/drivers/staging/wilc1000/wilc_wlan_if.h
> index 8fec64d..be972af 100644
> --- a/drivers/staging/wilc1000/wilc_wlan_if.h
> +++ b/drivers/staging/wilc1000/wilc_wlan_if.h
> @@ -315,7 +315,7 @@ typedef enum {
> SW_TRIGGER_ABORT,
> } TX_ABORT_OPTION_T;
>
> -typedef enum {
> +enum WID_TYPE {
The enum name should be lowecase, i.e. 'enum wid_type'.
> WID_CHAR = 0,
> WID_SHORT = 1,
> WID_INT = 2,
> @@ -326,8 +326,7 @@ typedef enum {
> WID_ADR = 7,
> WID_UNDEF = 8,
> WID_TYPE_FORCE_32BIT = 0xFFFFFFFF
> -
> -} WID_TYPE_T, tenuWIDtype;
> +};
>
> typedef enum {
> WID_NIL = 0xffff,
> --
> 1.9.1
--
Sincerely yours,
Mike.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 02/10] staging: wilc1000: remove typedef from tenuWIDtype
2015-10-06 15:14 ` Mike Rapoport
@ 2015-10-07 5:30 ` Tony Cho
0 siblings, 0 replies; 13+ messages in thread
From: Tony Cho @ 2015-10-07 5:30 UTC (permalink / raw)
To: Mike Rapoport
Cc: gregkh, devel, rachel.kim, chris.park, austin.shin,
linux-wireless, johnny.kim, Nicolas.FERRE, adel.noureldin,
leo.kim, adham.abozaeid
On 2015년 10월 07일 00:14, Mike Rapoport wrote:
> On Tue, Oct 06, 2015 at 06:42:13PM +0900, Tony Cho wrote:
>> From: Leo Kim <leo.kim@atmel.com>
>>
>> This patch remove typedef from the enum tenuWIDtype
>> and rename it to WID_TYPE.
>>
>> Signed-off-by: Leo Kim <leo.kim@atmel.com>
>> Signed-off-by: Tony Cho <tony.cho@atmel.com>
>> ---
>> drivers/staging/wilc1000/coreconfigurator.h | 2 +-
>> drivers/staging/wilc1000/host_interface.h | 2 +-
>> drivers/staging/wilc1000/wilc_wlan_if.h | 5 ++---
>> 3 files changed, 4 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h
>> index 306efc9..02faf58 100644
> [ snip ]
>
>> diff --git a/drivers/staging/wilc1000/wilc_wlan_if.h b/drivers/staging/wilc1000/wilc_wlan_if.h
>> index 8fec64d..be972af 100644
>> --- a/drivers/staging/wilc1000/wilc_wlan_if.h
>> +++ b/drivers/staging/wilc1000/wilc_wlan_if.h
>> @@ -315,7 +315,7 @@ typedef enum {
>> SW_TRIGGER_ABORT,
>> } TX_ABORT_OPTION_T;
>>
>> -typedef enum {
>> +enum WID_TYPE {
> The enum name should be lowecase, i.e. 'enum wid_type'.
>
All of enumerated types aren't uppercase. Can we mark outstanding enumeration with uppercase in specific file?
If this doesn't violate any rules in Linux coding style, I want to go as it did.
Thanks for your advice,
Tony.
>> WID_CHAR = 0,
>> WID_SHORT = 1,
>> WID_INT = 2,
>> @@ -326,8 +326,7 @@ typedef enum {
>> WID_ADR = 7,
>> WID_UNDEF = 8,
>> WID_TYPE_FORCE_32BIT = 0xFFFFFFFF
>> -
>> -} WID_TYPE_T, tenuWIDtype;
>> +};
>>
>> typedef enum {
>> WID_NIL = 0xffff,
>> --
>> 1.9.1
> --
> Sincerely yours,
> Mike.
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 01/10] staging: wilc1000: remove typedef from tstrWID
2015-10-06 9:42 [PATCH 01/10] staging: wilc1000: remove typedef from tstrWID Tony Cho
` (8 preceding siblings ...)
2015-10-06 9:42 ` [PATCH 10/10] staging: wilc1000: remove _tstrJoinParam from join_bss_param Tony Cho
@ 2015-10-08 10:00 ` Greg KH
9 siblings, 0 replies; 13+ messages in thread
From: Greg KH @ 2015-10-08 10:00 UTC (permalink / raw)
To: Tony Cho
Cc: devel, rachel.kim, chris.park, austin.shin, linux-wireless,
johnny.kim, Nicolas.FERRE, adel.noureldin, leo.kim,
adham.abozaeid
On Tue, Oct 06, 2015 at 06:42:12PM +0900, Tony Cho wrote:
> From: Leo Kim <leo.kim@atmel.com>
>
> This patch removes typedef from the struct tstrWID and
> rename it to wid.
>
> Signed-off-by: Leo Kim <leo.kim@atmel.com>
> Signed-off-by: Tony Cho <tony.cho@atmel.com>
> ---
> drivers/staging/wilc1000/coreconfigurator.c | 2 +-
> drivers/staging/wilc1000/coreconfigurator.h | 7 +--
> drivers/staging/wilc1000/host_interface.c | 92 ++++++++++++++---------------
> 3 files changed, 50 insertions(+), 51 deletions(-)
This series also did not apply :(
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2015-10-08 10:12 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-06 9:42 [PATCH 01/10] staging: wilc1000: remove typedef from tstrWID Tony Cho
2015-10-06 9:42 ` [PATCH 02/10] staging: wilc1000: remove typedef from tenuWIDtype Tony Cho
2015-10-06 15:14 ` Mike Rapoport
2015-10-07 5:30 ` Tony Cho
2015-10-06 9:42 ` [PATCH 03/10] staging: wilc1000: rename the member variable, enuWIDtype of wid Tony Cho
2015-10-06 9:42 ` [PATCH 04/10] staging: wilc1000: rename the member variable, u16WIDid " Tony Cho
2015-10-06 9:42 ` [PATCH 05/10] staging: wilc1000: rename the member variable, s32ValueSize " Tony Cho
2015-10-06 9:42 ` [PATCH 06/10] staging: wilc1000: rename the member variable, ps8WidVal " Tony Cho
2015-10-06 9:42 ` [PATCH 07/10] staging: wilc1000: remove unused struct tstrWidJoinReqExt Tony Cho
2015-10-06 9:42 ` [PATCH 08/10] staging: wilc1000: remove unused struct tstrBssTable Tony Cho
2015-10-06 9:42 ` [PATCH 09/10] staging: wilc1000: remove typedef from tstrJoinBssParam Tony Cho
2015-10-06 9:42 ` [PATCH 10/10] staging: wilc1000: remove _tstrJoinParam from join_bss_param Tony Cho
2015-10-08 10:00 ` [PATCH 01/10] staging: wilc1000: remove typedef from tstrWID Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).