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

staging: wilc1000: renames struct connect_resp_info variables

This patch renames to avoid camelcase and remove prefix names,
changes follow are:
 - u16capability to capability
 - u16ConnectStatus to status
 - u16AssocID to assoc_id
 - pu8RespIEs to ies
 - u16RespIEsLen to ies_len
Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 40d96e1d
...@@ -367,19 +367,19 @@ s32 wilc_parse_assoc_resp_info(u8 *buffer, u32 buffer_len, ...@@ -367,19 +367,19 @@ s32 wilc_parse_assoc_resp_info(u8 *buffer, u32 buffer_len,
assoc_resp_len = (u16)buffer_len; assoc_resp_len = (u16)buffer_len;
connect_resp_info->u16ConnectStatus = get_asoc_status(buffer); connect_resp_info->status = get_asoc_status(buffer);
if (connect_resp_info->u16ConnectStatus == SUCCESSFUL_STATUSCODE) { if (connect_resp_info->status == SUCCESSFUL_STATUSCODE) {
connect_resp_info->u16capability = get_assoc_resp_cap_info(buffer); connect_resp_info->capability = get_assoc_resp_cap_info(buffer);
connect_resp_info->u16AssocID = get_asoc_id(buffer); connect_resp_info->assoc_id = get_asoc_id(buffer);
ies = &buffer[CAP_INFO_LEN + STATUS_CODE_LEN + AID_LEN]; ies = &buffer[CAP_INFO_LEN + STATUS_CODE_LEN + AID_LEN];
ies_len = assoc_resp_len - (CAP_INFO_LEN + STATUS_CODE_LEN + AID_LEN); ies_len = assoc_resp_len - (CAP_INFO_LEN + STATUS_CODE_LEN + AID_LEN);
connect_resp_info->pu8RespIEs = kmemdup(ies, ies_len, GFP_KERNEL); connect_resp_info->ies = kmemdup(ies, ies_len, GFP_KERNEL);
if (!connect_resp_info->pu8RespIEs) if (!connect_resp_info->ies)
return -ENOMEM; return -ENOMEM;
connect_resp_info->u16RespIEsLen = ies_len; connect_resp_info->ies_len = ies_len;
} }
*ret_connect_resp_info = connect_resp_info; *ret_connect_resp_info = connect_resp_info;
......
...@@ -98,11 +98,11 @@ typedef struct { ...@@ -98,11 +98,11 @@ typedef struct {
} tstrNetworkInfo; } tstrNetworkInfo;
struct connect_resp_info { struct connect_resp_info {
u16 u16capability; u16 capability;
u16 u16ConnectStatus; u16 status;
u16 u16AssocID; u16 assoc_id;
u8 *pu8RespIEs; u8 *ies;
u16 u16RespIEsLen; u16 ies_len;
}; };
typedef struct { typedef struct {
......
...@@ -1489,19 +1489,19 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif, ...@@ -1489,19 +1489,19 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif,
if (s32Err) { if (s32Err) {
PRINT_ER("wilc_parse_assoc_resp_info() returned error %d\n", s32Err); PRINT_ER("wilc_parse_assoc_resp_info() returned error %d\n", s32Err);
} else { } else {
strConnectInfo.u16ConnectStatus = pstrConnectRespInfo->u16ConnectStatus; strConnectInfo.u16ConnectStatus = pstrConnectRespInfo->status;
if (strConnectInfo.u16ConnectStatus == SUCCESSFUL_STATUSCODE) { if (strConnectInfo.u16ConnectStatus == SUCCESSFUL_STATUSCODE) {
if (pstrConnectRespInfo->pu8RespIEs) { if (pstrConnectRespInfo->ies) {
strConnectInfo.u16RespIEsLen = pstrConnectRespInfo->u16RespIEsLen; strConnectInfo.u16RespIEsLen = pstrConnectRespInfo->ies_len;
strConnectInfo.pu8RespIEs = kmalloc(pstrConnectRespInfo->u16RespIEsLen, GFP_KERNEL); strConnectInfo.pu8RespIEs = kmalloc(pstrConnectRespInfo->ies_len, GFP_KERNEL);
memcpy(strConnectInfo.pu8RespIEs, pstrConnectRespInfo->pu8RespIEs, memcpy(strConnectInfo.pu8RespIEs, pstrConnectRespInfo->ies,
pstrConnectRespInfo->u16RespIEsLen); pstrConnectRespInfo->ies_len);
} }
} }
if (pstrConnectRespInfo) { if (pstrConnectRespInfo) {
kfree(pstrConnectRespInfo->pu8RespIEs); kfree(pstrConnectRespInfo->ies);
kfree(pstrConnectRespInfo); kfree(pstrConnectRespInfo);
} }
} }
......
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