hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: wilc1000: rename struct tstrConnectInfo 

This patch renames struct tstrConnectInfo to connect_info to avoid
camelcase and removes typedef.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Chaehyun Lim 2016-02-25 09:15:42 +09:00 committed by Greg Kroah-Hartman
parent 0c9e21d397
commit 3b0437e18a
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/wilc1000/coreconfigurator.h
View File

@ -105,14 +105,14 @@ struct connect_resp_info {
u16 ies_len; u16 ies_len;
}; };
typedef struct { struct connect_info {
u8 au8bssid[6]; u8 au8bssid[6];
u8 *pu8ReqIEs; u8 *pu8ReqIEs;
size_t ReqIEsLen; size_t ReqIEsLen;
u8 *pu8RespIEs; u8 *pu8RespIEs;
u16 u16RespIEsLen; u16 u16RespIEsLen;
u16 u16ConnectStatus; u16 u16ConnectStatus;
} tstrConnectInfo; };
typedef struct { typedef struct {
u16 u16reason; u16 u16reason;

12
drivers/staging/wilc1000/host_interface.c
View File

@ -1147,11 +1147,11 @@ static s32 Handle_Connect(struct wilc_vif *vif,
ERRORHANDLER: ERRORHANDLER:
if (result) { if (result) {
tstrConnectInfo strConnectInfo; struct connect_info strConnectInfo;
del_timer(&hif_drv->connect_timer); del_timer(&hif_drv->connect_timer);
memset(&strConnectInfo, 0, sizeof(tstrConnectInfo)); memset(&strConnectInfo, 0, sizeof(struct connect_info));
if (pstrHostIFconnectAttr->result) { if (pstrHostIFconnectAttr->result) {
if (pstrHostIFconnectAttr->bssid) if (pstrHostIFconnectAttr->bssid)
@ -1242,7 +1242,7 @@ static s32 Handle_FlushConnect(struct wilc_vif *vif)
static s32 Handle_ConnectTimeout(struct wilc_vif *vif) static s32 Handle_ConnectTimeout(struct wilc_vif *vif)
{ {
s32 result = 0; s32 result = 0;
tstrConnectInfo strConnectInfo; struct connect_info strConnectInfo;
struct wid wid; struct wid wid;
u16 u16DummyReasonCode = 0; u16 u16DummyReasonCode = 0;
struct host_if_drv *hif_drv = vif->hif_drv; struct host_if_drv *hif_drv = vif->hif_drv;
@ -1256,7 +1256,7 @@ static s32 Handle_ConnectTimeout(struct wilc_vif *vif)
scan_while_connected = false; scan_while_connected = false;
memset(&strConnectInfo, 0, sizeof(tstrConnectInfo)); memset(&strConnectInfo, 0, sizeof(struct connect_info));
if (hif_drv->usr_conn_req.conn_result) { if (hif_drv->usr_conn_req.conn_result) {
if (hif_drv->usr_conn_req.bssid) { if (hif_drv->usr_conn_req.bssid) {
@ -1410,7 +1410,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif,
u8 u8MacStatus; u8 u8MacStatus;
u8 u8MacStatusReasonCode; u8 u8MacStatusReasonCode;
u8 u8MacStatusAdditionalInfo; u8 u8MacStatusAdditionalInfo;
tstrConnectInfo strConnectInfo; struct connect_info strConnectInfo;
tstrDisconnectNotifInfo strDisconnectNotifInfo; tstrDisconnectNotifInfo strDisconnectNotifInfo;
s32 s32Err = 0; s32 s32Err = 0;
struct host_if_drv *hif_drv = vif->hif_drv; struct host_if_drv *hif_drv = vif->hif_drv;
@ -1447,7 +1447,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif,
u32 u32RcvdAssocRespInfoLen = 0; u32 u32RcvdAssocRespInfoLen = 0;
struct connect_resp_info *pstrConnectRespInfo = NULL; struct connect_resp_info *pstrConnectRespInfo = NULL;
memset(&strConnectInfo, 0, sizeof(tstrConnectInfo)); memset(&strConnectInfo, 0, sizeof(struct connect_info));
if (u8MacStatus == MAC_CONNECTED) { if (u8MacStatus == MAC_CONNECTED) {
memset(rcv_assoc_resp, 0, MAX_ASSOC_RESP_FRAME_SIZE); memset(rcv_assoc_resp, 0, MAX_ASSOC_RESP_FRAME_SIZE);

2
drivers/staging/wilc1000/host_interface.h
View File

@ -172,7 +172,7 @@ typedef void (*wilc_scan_result)(enum scan_event, struct network_info *,
void *, void *); void *, void *);
typedef void (*wilc_connect_result)(enum conn_event, typedef void (*wilc_connect_result)(enum conn_event,
tstrConnectInfo *, struct connect_info *,
u8, u8,
tstrDisconnectNotifInfo *, tstrDisconnectNotifInfo *,
void *); void *);

2
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
View File

@ -479,7 +479,7 @@ static void CfgScanResult(enum scan_event scan_event,
int wilc_connecting; int wilc_connecting;
static void CfgConnectResult(enum conn_event enuConnDisconnEvent, static void CfgConnectResult(enum conn_event enuConnDisconnEvent,
tstrConnectInfo *pstrConnectInfo, struct connect_info *pstrConnectInfo,
u8 u8MacStatus, u8 u8MacStatus,
tstrDisconnectNotifInfo *pstrDisconnectNotifInfo, tstrDisconnectNotifInfo *pstrDisconnectNotifInfo,
void *pUserVoid) void *pUserVoid)