staging: wilc1000: rename pfConnectResult of struct connect_attr

[karo-tx-linux.git] / drivers / staging / wilc1000 / host_interface.c

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 3c044d20a857567b1020552c85bfef50602eaad3..fc82d4617212d8bbab349a72a0b9ebd48f52415c 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -110,11 +110,11 @@ struct scan_attr {
 struct connect_attr {
        u8 *bssid;
        u8 *ssid;
-       size_t ssidLen;
-       u8 *pu8IEs;
-       size_t IEsLen;
-       u8 u8security;
-       wilc_connect_result pfConnectResult;
+       size_t ssid_len;
+       u8 *ies;
+       size_t ies_len;
+       u8 security;
+       wilc_connect_result result;
        void *pvUserArg;
        enum AUTHTYPE tenuAuth_type;
        u8 u8channel;
@@ -1036,24 +1036,24 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
                memcpy(hif_drv->strWILC_UsrConnReq.pu8bssid, pstrHostIFconnectAttr->bssid, 6);
        }
 
-       hif_drv->strWILC_UsrConnReq.ssidLen = pstrHostIFconnectAttr->ssidLen;
+       hif_drv->strWILC_UsrConnReq.ssidLen = pstrHostIFconnectAttr->ssid_len;
        if (pstrHostIFconnectAttr->ssid != NULL) {
-               hif_drv->strWILC_UsrConnReq.pu8ssid = kmalloc(pstrHostIFconnectAttr->ssidLen + 1, GFP_KERNEL);
+               hif_drv->strWILC_UsrConnReq.pu8ssid = kmalloc(pstrHostIFconnectAttr->ssid_len + 1, GFP_KERNEL);
                memcpy(hif_drv->strWILC_UsrConnReq.pu8ssid, pstrHostIFconnectAttr->ssid,
-                           pstrHostIFconnectAttr->ssidLen);
-               hif_drv->strWILC_UsrConnReq.pu8ssid[pstrHostIFconnectAttr->ssidLen] = '\0';
+                           pstrHostIFconnectAttr->ssid_len);
+               hif_drv->strWILC_UsrConnReq.pu8ssid[pstrHostIFconnectAttr->ssid_len] = '\0';
        }
 
-       hif_drv->strWILC_UsrConnReq.ConnReqIEsLen = pstrHostIFconnectAttr->IEsLen;
-       if (pstrHostIFconnectAttr->pu8IEs != NULL) {
-               hif_drv->strWILC_UsrConnReq.pu8ConnReqIEs = kmalloc(pstrHostIFconnectAttr->IEsLen, GFP_KERNEL);
-               memcpy(hif_drv->strWILC_UsrConnReq.pu8ConnReqIEs, pstrHostIFconnectAttr->pu8IEs,
-                           pstrHostIFconnectAttr->IEsLen);
+       hif_drv->strWILC_UsrConnReq.ConnReqIEsLen = pstrHostIFconnectAttr->ies_len;
+       if (pstrHostIFconnectAttr->ies != NULL) {
+               hif_drv->strWILC_UsrConnReq.pu8ConnReqIEs = kmalloc(pstrHostIFconnectAttr->ies_len, GFP_KERNEL);
+               memcpy(hif_drv->strWILC_UsrConnReq.pu8ConnReqIEs, pstrHostIFconnectAttr->ies,
+                           pstrHostIFconnectAttr->ies_len);
        }
 
-       hif_drv->strWILC_UsrConnReq.u8security = pstrHostIFconnectAttr->u8security;
+       hif_drv->strWILC_UsrConnReq.u8security = pstrHostIFconnectAttr->security;
        hif_drv->strWILC_UsrConnReq.tenuAuth_type = pstrHostIFconnectAttr->tenuAuth_type;
-       hif_drv->strWILC_UsrConnReq.pfUserConnectResult = pstrHostIFconnectAttr->pfConnectResult;
+       hif_drv->strWILC_UsrConnReq.pfUserConnectResult = pstrHostIFconnectAttr->result;
        hif_drv->strWILC_UsrConnReq.u32UserConnectPvoid = pstrHostIFconnectAttr->pvUserArg;
 
        strWIDList[u32WidsCount].id = WID_SUCCESS_FRAME_COUNT;
@@ -1132,8 +1132,8 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
 
 
        if (pstrHostIFconnectAttr->ssid != NULL) {
-               memcpy(pu8CurrByte, pstrHostIFconnectAttr->ssid, pstrHostIFconnectAttr->ssidLen);
-               pu8CurrByte[pstrHostIFconnectAttr->ssidLen] = '\0';
+               memcpy(pu8CurrByte, pstrHostIFconnectAttr->ssid, pstrHostIFconnectAttr->ssid_len);
+               pu8CurrByte[pstrHostIFconnectAttr->ssid_len] = '\0';
        }
        pu8CurrByte += MAX_SSID_LEN;
        *(pu8CurrByte++) = INFRASTRUCTURE;
@@ -1258,19 +1258,19 @@ ERRORHANDLER:
 
                memset(&strConnectInfo, 0, sizeof(tstrConnectInfo));
 
-               if (pstrHostIFconnectAttr->pfConnectResult != NULL) {
+               if (pstrHostIFconnectAttr->result != NULL) {
                        if (pstrHostIFconnectAttr->bssid != NULL)
                                memcpy(strConnectInfo.au8bssid, pstrHostIFconnectAttr->bssid, 6);
 
-                       if (pstrHostIFconnectAttr->pu8IEs != NULL) {
-                               strConnectInfo.ReqIEsLen = pstrHostIFconnectAttr->IEsLen;
-                               strConnectInfo.pu8ReqIEs = kmalloc(pstrHostIFconnectAttr->IEsLen, GFP_KERNEL);
+                       if (pstrHostIFconnectAttr->ies != NULL) {
+                               strConnectInfo.ReqIEsLen = pstrHostIFconnectAttr->ies_len;
+                               strConnectInfo.pu8ReqIEs = kmalloc(pstrHostIFconnectAttr->ies_len, GFP_KERNEL);
                                memcpy(strConnectInfo.pu8ReqIEs,
-                                           pstrHostIFconnectAttr->pu8IEs,
-                                           pstrHostIFconnectAttr->IEsLen);
+                                           pstrHostIFconnectAttr->ies,
+                                           pstrHostIFconnectAttr->ies_len);
                        }
 
-                       pstrHostIFconnectAttr->pfConnectResult(CONN_DISCONN_EVENT_CONN_RESP,
+                       pstrHostIFconnectAttr->result(CONN_DISCONN_EVENT_CONN_RESP,
                                                               &strConnectInfo,
                                                               MAC_DISCONNECTED,
                                                               NULL,
@@ -1297,9 +1297,9 @@ ERRORHANDLER:
                pstrHostIFconnectAttr->ssid = NULL;
        }
 
-       if (pstrHostIFconnectAttr->pu8IEs != NULL) {
-               kfree(pstrHostIFconnectAttr->pu8IEs);
-               pstrHostIFconnectAttr->pu8IEs = NULL;
+       if (pstrHostIFconnectAttr->ies != NULL) {
+               kfree(pstrHostIFconnectAttr->ies);
+               pstrHostIFconnectAttr->ies = NULL;
        }
 
        if (pu8CurrByte != NULL)
@@ -3611,10 +3611,10 @@ s32 host_int_set_join_req(struct host_if_drv *hif_drv, u8 *pu8bssid,
 
        msg.id = HOST_IF_MSG_CONNECT;
 
-       msg.body.con_info.u8security = u8security;
+       msg.body.con_info.security = u8security;
        msg.body.con_info.tenuAuth_type = tenuAuth_type;
        msg.body.con_info.u8channel = u8channel;
-       msg.body.con_info.pfConnectResult = pfConnectResult;
+       msg.body.con_info.result = pfConnectResult;
        msg.body.con_info.pvUserArg = pvUserArg;
        msg.body.con_info.pJoinParams = pJoinParams;
        msg.drv = hif_drv ;
@@ -3625,16 +3625,15 @@ s32 host_int_set_join_req(struct host_if_drv *hif_drv, u8 *pu8bssid,
        }
 
        if (pu8ssid != NULL) {
-               msg.body.con_info.ssidLen = ssidLen;
+               msg.body.con_info.ssid_len = ssidLen;
                msg.body.con_info.ssid = kmalloc(ssidLen, GFP_KERNEL);
                memcpy(msg.body.con_info.ssid, pu8ssid, ssidLen);
        }
 
        if (pu8IEs != NULL) {
-               msg.body.con_info.IEsLen = IEsLen;
-               msg.body.con_info.pu8IEs = kmalloc(IEsLen, GFP_KERNEL);
-               memcpy(msg.body.con_info.pu8IEs,
-                           pu8IEs, 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);
        }
        if (hif_drv->enuHostIFstate < HOST_IF_CONNECTING)
                hif_drv->enuHostIFstate = HOST_IF_CONNECTING;