From: Leo Kim Date: Tue, 13 Oct 2015 10:49:53 +0000 (+0900) Subject: staging: wilc1000: rename IEsLen of struct connect_attr X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b59d5c5b57b6ddef538aacef597a3278a7ab09c4;p=linux-beck.git staging: wilc1000: rename IEsLen of struct connect_attr This patch renames IEsLen of struct connect_attr to ies_len to avoid CamelCase naming convention. Signed-off-by: Leo Kim Signed-off-by: Tony Cho Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 5d0e4127590d..545f763332dd 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -112,7 +112,7 @@ struct connect_attr { u8 *ssid; size_t ssid_len; u8 *ies; - size_t IEsLen; + size_t ies_len; u8 u8security; wilc_connect_result pfConnectResult; void *pvUserArg; @@ -1044,11 +1044,11 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv, hif_drv->strWILC_UsrConnReq.pu8ssid[pstrHostIFconnectAttr->ssid_len] = '\0'; } - hif_drv->strWILC_UsrConnReq.ConnReqIEsLen = pstrHostIFconnectAttr->IEsLen; + hif_drv->strWILC_UsrConnReq.ConnReqIEsLen = pstrHostIFconnectAttr->ies_len; if (pstrHostIFconnectAttr->ies != NULL) { - hif_drv->strWILC_UsrConnReq.pu8ConnReqIEs = kmalloc(pstrHostIFconnectAttr->IEsLen, GFP_KERNEL); + hif_drv->strWILC_UsrConnReq.pu8ConnReqIEs = kmalloc(pstrHostIFconnectAttr->ies_len, GFP_KERNEL); memcpy(hif_drv->strWILC_UsrConnReq.pu8ConnReqIEs, pstrHostIFconnectAttr->ies, - pstrHostIFconnectAttr->IEsLen); + pstrHostIFconnectAttr->ies_len); } hif_drv->strWILC_UsrConnReq.u8security = pstrHostIFconnectAttr->u8security; @@ -1263,11 +1263,11 @@ ERRORHANDLER: memcpy(strConnectInfo.au8bssid, pstrHostIFconnectAttr->bssid, 6); if (pstrHostIFconnectAttr->ies != NULL) { - strConnectInfo.ReqIEsLen = pstrHostIFconnectAttr->IEsLen; - strConnectInfo.pu8ReqIEs = kmalloc(pstrHostIFconnectAttr->IEsLen, GFP_KERNEL); + strConnectInfo.ReqIEsLen = pstrHostIFconnectAttr->ies_len; + strConnectInfo.pu8ReqIEs = kmalloc(pstrHostIFconnectAttr->ies_len, GFP_KERNEL); memcpy(strConnectInfo.pu8ReqIEs, pstrHostIFconnectAttr->ies, - pstrHostIFconnectAttr->IEsLen); + pstrHostIFconnectAttr->ies_len); } pstrHostIFconnectAttr->pfConnectResult(CONN_DISCONN_EVENT_CONN_RESP, @@ -3631,7 +3631,7 @@ s32 host_int_set_join_req(struct host_if_drv *hif_drv, u8 *pu8bssid, } if (pu8IEs != NULL) { - msg.body.con_info.IEsLen = IEsLen; + msg.body.con_info.ies_len = IEsLen; msg.body.con_info.ies = kmalloc(IEsLen, GFP_KERNEL); memcpy(msg.body.con_info.ies, pu8IEs, IEsLen); }