Commit 73abaa49 authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman

staging: wilc1000: rename u32UserConnectPvoid of struct user_conn_req

This patch renames u32UserConnectPvoid of struct user_conn_req to arg
to avoid CamelCase naming convention.
Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ff06982c
...@@ -1030,7 +1030,7 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv, ...@@ -1030,7 +1030,7 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
hif_drv->usr_conn_req.u8security = pstrHostIFconnectAttr->security; hif_drv->usr_conn_req.u8security = pstrHostIFconnectAttr->security;
hif_drv->usr_conn_req.tenuAuth_type = pstrHostIFconnectAttr->auth_type; hif_drv->usr_conn_req.tenuAuth_type = pstrHostIFconnectAttr->auth_type;
hif_drv->usr_conn_req.conn_result = pstrHostIFconnectAttr->result; hif_drv->usr_conn_req.conn_result = pstrHostIFconnectAttr->result;
hif_drv->usr_conn_req.u32UserConnectPvoid = pstrHostIFconnectAttr->arg; hif_drv->usr_conn_req.arg = pstrHostIFconnectAttr->arg;
strWIDList[u32WidsCount].id = WID_SUCCESS_FRAME_COUNT; strWIDList[u32WidsCount].id = WID_SUCCESS_FRAME_COUNT;
strWIDList[u32WidsCount].type = WID_INT; strWIDList[u32WidsCount].type = WID_INT;
...@@ -1351,7 +1351,7 @@ static s32 Handle_ConnectTimeout(struct host_if_drv *hif_drv) ...@@ -1351,7 +1351,7 @@ static s32 Handle_ConnectTimeout(struct host_if_drv *hif_drv)
&strConnectInfo, &strConnectInfo,
MAC_DISCONNECTED, MAC_DISCONNECTED,
NULL, NULL,
hif_drv->usr_conn_req.u32UserConnectPvoid); hif_drv->usr_conn_req.arg);
kfree(strConnectInfo.pu8ReqIEs); kfree(strConnectInfo.pu8ReqIEs);
strConnectInfo.pu8ReqIEs = NULL; strConnectInfo.pu8ReqIEs = NULL;
...@@ -1599,7 +1599,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv *hif_drv, ...@@ -1599,7 +1599,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv *hif_drv,
&strConnectInfo, &strConnectInfo,
u8MacStatus, u8MacStatus,
NULL, NULL,
hif_drv->usr_conn_req.u32UserConnectPvoid); hif_drv->usr_conn_req.arg);
if ((u8MacStatus == MAC_CONNECTED) && if ((u8MacStatus == MAC_CONNECTED) &&
(strConnectInfo.u16ConnectStatus == SUCCESSFUL_STATUSCODE)) { (strConnectInfo.u16ConnectStatus == SUCCESSFUL_STATUSCODE)) {
...@@ -1652,7 +1652,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv *hif_drv, ...@@ -1652,7 +1652,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv *hif_drv,
NULL, NULL,
0, 0,
&strDisconnectNotifInfo, &strDisconnectNotifInfo,
hif_drv->usr_conn_req.u32UserConnectPvoid); hif_drv->usr_conn_req.arg);
} else { } else {
PRINT_ER("Connect result callback function is NULL\n"); PRINT_ER("Connect result callback function is NULL\n");
} }
...@@ -2017,7 +2017,7 @@ static void Handle_Disconnect(struct host_if_drv *hif_drv) ...@@ -2017,7 +2017,7 @@ static void Handle_Disconnect(struct host_if_drv *hif_drv)
NULL, NULL,
0, 0,
&strDisconnectNotifInfo, &strDisconnectNotifInfo,
hif_drv->usr_conn_req.u32UserConnectPvoid); hif_drv->usr_conn_req.arg);
} else { } else {
PRINT_ER("usr_conn_req.conn_result = NULL\n"); PRINT_ER("usr_conn_req.conn_result = NULL\n");
} }
......
...@@ -208,7 +208,7 @@ struct user_conn_req { ...@@ -208,7 +208,7 @@ struct user_conn_req {
size_t ies_len; size_t ies_len;
wilc_connect_result conn_result; wilc_connect_result conn_result;
bool ht_capable; bool ht_capable;
void *u32UserConnectPvoid; void *arg;
}; };
struct drv_handler { struct drv_handler {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment