Skip to content

Commit e0a1221

Browse files
Leo-Kimgregkh
authored andcommitted
staging: wilc1000: remove typedef from tstrJoinBssParam
This patch removes typedef from the struct tstrJoinBssParam and renames it to join_bss_param. Signed-off-by: Leo Kim <[email protected]> Signed-off-by: Tony Cho <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent c0dba8d commit e0a1221

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

drivers/staging/wilc1000/host_interface.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ struct host_if_msg {
407407
};
408408

409409
/*Struct containg joinParam of each AP*/
410-
typedef struct _tstrJoinBssParam {
410+
struct join_bss_param {
411411
BSSTYPE_T bss_type;
412412
u8 dtim_period;
413413
u16 beacon_period;
@@ -435,7 +435,7 @@ typedef struct _tstrJoinBssParam {
435435
u8 au8Duration[4];
436436
u8 au8Interval[4];
437437
u8 au8StartTime[4];
438-
} tstrJoinBssParam;
438+
};
439439

440440
typedef enum {
441441
SCAN_TIMER = 0,
@@ -1438,7 +1438,7 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler,
14381438
u32 u32WidsCount = 0, dummyval = 0;
14391439
/* char passphrase[] = "12345678"; */
14401440
u8 *pu8CurrByte = NULL;
1441-
tstrJoinBssParam *ptstrJoinBssParam;
1441+
struct join_bss_param *ptstrJoinBssParam;
14421442

14431443
PRINT_D(GENERIC_DBG, "Handling connect request\n");
14441444

@@ -1453,7 +1453,7 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler,
14531453

14541454
PRINT_INFO(HOSTINF_DBG, "Saving connection parameters in global structure\n");
14551455

1456-
ptstrJoinBssParam = (tstrJoinBssParam *)pstrHostIFconnectAttr->pJoinParams;
1456+
ptstrJoinBssParam = (struct join_bss_param *)pstrHostIFconnectAttr->pJoinParams;
14571457
if (ptstrJoinBssParam == NULL) {
14581458
PRINT_ER("Required BSSID not found\n");
14591459
s32Error = -ENOENT;
@@ -6700,7 +6700,7 @@ s32 host_int_setup_multicast_filter(struct host_if_drv *hWFIDrv, bool bIsEnabled
67006700
* @version 1.0**/
67016701
static void *host_int_ParseJoinBssParam(tstrNetworkInfo *ptstrNetworkInfo)
67026702
{
6703-
tstrJoinBssParam *pNewJoinBssParam = NULL;
6703+
struct join_bss_param *pNewJoinBssParam = NULL;
67046704
u8 *pu8IEs;
67056705
u16 u16IEsLen;
67066706
u16 index = 0;
@@ -6716,9 +6716,9 @@ static void *host_int_ParseJoinBssParam(tstrNetworkInfo *ptstrNetworkInfo)
67166716
pu8IEs = ptstrNetworkInfo->pu8IEs;
67176717
u16IEsLen = ptstrNetworkInfo->u16IEsLen;
67186718

6719-
pNewJoinBssParam = kmalloc(sizeof(tstrJoinBssParam), GFP_KERNEL);
6719+
pNewJoinBssParam = kmalloc(sizeof(struct join_bss_param), GFP_KERNEL);
67206720
if (pNewJoinBssParam != NULL) {
6721-
memset(pNewJoinBssParam, 0, sizeof(tstrJoinBssParam));
6721+
memset(pNewJoinBssParam, 0, sizeof(struct join_bss_param));
67226722
pNewJoinBssParam->dtim_period = ptstrNetworkInfo->u8DtimPeriod;
67236723
pNewJoinBssParam->beacon_period = ptstrNetworkInfo->u16BeaconPeriod;
67246724
pNewJoinBssParam->cap_info = ptstrNetworkInfo->u16CapInfo;
@@ -6902,8 +6902,8 @@ static void *host_int_ParseJoinBssParam(tstrNetworkInfo *ptstrNetworkInfo)
69026902

69036903
void host_int_freeJoinParams(void *pJoinParams)
69046904
{
6905-
if ((tstrJoinBssParam *)pJoinParams != NULL)
6906-
kfree((tstrJoinBssParam *)pJoinParams);
6905+
if ((struct bss_param *)pJoinParams != NULL)
6906+
kfree((struct bss_param *)pJoinParams);
69076907
else
69086908
PRINT_ER("Unable to FREE null pointer\n");
69096909
}

0 commit comments

Comments
 (0)