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 91ea327a796ffce0aebae340608b4e75a47b4b3a..fc82d4617212d8bbab349a72a0b9ebd48f52415c 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -108,13 +108,13 @@ struct scan_attr {
 };
 
 struct connect_attr {
-       u8 *pu8bssid;
-       u8 *pu8ssid;
-       size_t ssidLen;
-       u8 *pu8IEs;
-       size_t IEsLen;
-       u8 u8security;
-       wilc_connect_result pfConnectResult;
+       u8 *bssid;
+       u8 *ssid;
+       size_t ssid_len;
+       u8 *ies;
+       size_t ies_len;
+       u8 security;
+       wilc_connect_result result;
        void *pvUserArg;
        enum AUTHTYPE tenuAuth_type;
        u8 u8channel;
@@ -1015,7 +1015,7 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
 
        PRINT_D(GENERIC_DBG, "Handling connect request\n");
 
-       if (memcmp(pstrHostIFconnectAttr->pu8bssid, u8ConnectedSSID, ETH_ALEN) == 0) {
+       if (memcmp(pstrHostIFconnectAttr->bssid, u8ConnectedSSID, ETH_ALEN) == 0) {
 
                s32Error = 0;
                PRINT_ER("Trying to connect to an already connected AP, Discard connect request\n");
@@ -1031,29 +1031,29 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
                goto ERRORHANDLER;
        }
 
-       if (pstrHostIFconnectAttr->pu8bssid != NULL) {
+       if (pstrHostIFconnectAttr->bssid != NULL) {
                hif_drv->strWILC_UsrConnReq.pu8bssid = kmalloc(6, GFP_KERNEL);
-               memcpy(hif_drv->strWILC_UsrConnReq.pu8bssid, pstrHostIFconnectAttr->pu8bssid, 6);
+               memcpy(hif_drv->strWILC_UsrConnReq.pu8bssid, pstrHostIFconnectAttr->bssid, 6);
        }
 
-       hif_drv->strWILC_UsrConnReq.ssidLen = pstrHostIFconnectAttr->ssidLen;
-       if (pstrHostIFconnectAttr->pu8ssid != NULL) {
-               hif_drv->strWILC_UsrConnReq.pu8ssid = kmalloc(pstrHostIFconnectAttr->ssidLen + 1, GFP_KERNEL);
-               memcpy(hif_drv->strWILC_UsrConnReq.pu8ssid, pstrHostIFconnectAttr->pu8ssid,
-                           pstrHostIFconnectAttr->ssidLen);
-               hif_drv->strWILC_UsrConnReq.pu8ssid[pstrHostIFconnectAttr->ssidLen] = '\0';
+       hif_drv->strWILC_UsrConnReq.ssidLen = pstrHostIFconnectAttr->ssid_len;
+       if (pstrHostIFconnectAttr->ssid != NULL) {
+               hif_drv->strWILC_UsrConnReq.pu8ssid = kmalloc(pstrHostIFconnectAttr->ssid_len + 1, GFP_KERNEL);
+               memcpy(hif_drv->strWILC_UsrConnReq.pu8ssid, pstrHostIFconnectAttr->ssid,
+                           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;
@@ -1081,7 +1081,7 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
                strWIDList[u32WidsCount].size = hif_drv->strWILC_UsrConnReq.ConnReqIEsLen;
                u32WidsCount++;
 
-               if (memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7)) {
+               if (memcmp("DIRECT-", pstrHostIFconnectAttr->ssid, 7)) {
 
                        gu32FlushedInfoElemAsocSize = hif_drv->strWILC_UsrConnReq.ConnReqIEsLen;
                        gu8FlushedInfoElemAsoc =  kmalloc(gu32FlushedInfoElemAsocSize, GFP_KERNEL);
@@ -1095,7 +1095,7 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
        strWIDList[u32WidsCount].val = (s8 *)(&(hif_drv->strWILC_UsrConnReq.u8security));
        u32WidsCount++;
 
-       if (memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7))
+       if (memcmp("DIRECT-", pstrHostIFconnectAttr->ssid, 7))
                gu8Flushed11iMode = hif_drv->strWILC_UsrConnReq.u8security;
 
        PRINT_INFO(HOSTINF_DBG, "Encrypt Mode = %x\n", hif_drv->strWILC_UsrConnReq.u8security);
@@ -1107,7 +1107,7 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
        strWIDList[u32WidsCount].val = (s8 *)(&hif_drv->strWILC_UsrConnReq.tenuAuth_type);
        u32WidsCount++;
 
-       if (memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7))
+       if (memcmp("DIRECT-", pstrHostIFconnectAttr->ssid, 7))
                gu8FlushedAuthType = (u8)hif_drv->strWILC_UsrConnReq.tenuAuth_type;
 
        PRINT_INFO(HOSTINF_DBG, "Authentication Type = %x\n", hif_drv->strWILC_UsrConnReq.tenuAuth_type);
@@ -1119,7 +1119,7 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
        strWIDList[u32WidsCount].size = 112;
        strWIDList[u32WidsCount].val = kmalloc(strWIDList[u32WidsCount].size, GFP_KERNEL);
 
-       if (memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7)) {
+       if (memcmp("DIRECT-", pstrHostIFconnectAttr->ssid, 7)) {
                gu32FlushedJoinReqSize = strWIDList[u32WidsCount].size;
                gu8FlushedJoinReq = kmalloc(gu32FlushedJoinReqSize, GFP_KERNEL);
        }
@@ -1131,9 +1131,9 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
        pu8CurrByte = strWIDList[u32WidsCount].val;
 
 
-       if (pstrHostIFconnectAttr->pu8ssid != NULL) {
-               memcpy(pu8CurrByte, pstrHostIFconnectAttr->pu8ssid, pstrHostIFconnectAttr->ssidLen);
-               pu8CurrByte[pstrHostIFconnectAttr->ssidLen] = '\0';
+       if (pstrHostIFconnectAttr->ssid != NULL) {
+               memcpy(pu8CurrByte, pstrHostIFconnectAttr->ssid, pstrHostIFconnectAttr->ssid_len);
+               pu8CurrByte[pstrHostIFconnectAttr->ssid_len] = '\0';
        }
        pu8CurrByte += MAX_SSID_LEN;
        *(pu8CurrByte++) = INFRASTRUCTURE;
@@ -1148,8 +1148,8 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
        *(pu8CurrByte++)  = ((ptstrJoinBssParam->cap_info) >> 8) & 0xFF;
        PRINT_D(HOSTINF_DBG, "* Cap Info %0x*\n", (*(pu8CurrByte - 2) | ((*(pu8CurrByte - 1)) << 8)));
 
-       if (pstrHostIFconnectAttr->pu8bssid != NULL)
-               memcpy(pu8CurrByte, pstrHostIFconnectAttr->pu8bssid, 6);
+       if (pstrHostIFconnectAttr->bssid != NULL)
+               memcpy(pu8CurrByte, pstrHostIFconnectAttr->bssid, 6);
        pu8CurrByte += 6;
 
        *(pu8CurrByte++)  = (ptstrJoinBssParam->beacon_period) & 0xFF;
@@ -1223,17 +1223,17 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
        u32WidsCount++;
        gu32WidConnRstHack = 0;
 
-       if (memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7)) {
+       if (memcmp("DIRECT-", pstrHostIFconnectAttr->ssid, 7)) {
                memcpy(gu8FlushedJoinReq, pu8CurrByte, gu32FlushedJoinReqSize);
                gu8FlushedJoinReqDrvHandler = hif_drv;
        }
 
        PRINT_D(GENERIC_DBG, "send HOST_IF_WAITING_CONN_RESP\n");
 
-       if (pstrHostIFconnectAttr->pu8bssid != NULL) {
-               memcpy(u8ConnectedSSID, pstrHostIFconnectAttr->pu8bssid, ETH_ALEN);
+       if (pstrHostIFconnectAttr->bssid != NULL) {
+               memcpy(u8ConnectedSSID, pstrHostIFconnectAttr->bssid, ETH_ALEN);
 
-               PRINT_D(GENERIC_DBG, "save Bssid = %pM\n", pstrHostIFconnectAttr->pu8bssid);
+               PRINT_D(GENERIC_DBG, "save Bssid = %pM\n", pstrHostIFconnectAttr->bssid);
                PRINT_D(GENERIC_DBG, "save bssid = %pM\n", u8ConnectedSSID);
        }
 
@@ -1258,19 +1258,19 @@ ERRORHANDLER:
 
                memset(&strConnectInfo, 0, sizeof(tstrConnectInfo));
 
-               if (pstrHostIFconnectAttr->pfConnectResult != NULL) {
-                       if (pstrHostIFconnectAttr->pu8bssid != NULL)
-                               memcpy(strConnectInfo.au8bssid, pstrHostIFconnectAttr->pu8bssid, 6);
+               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,
@@ -1287,19 +1287,19 @@ ERRORHANDLER:
        }
 
        PRINT_D(HOSTINF_DBG, "Deallocating connection parameters\n");
-       if (pstrHostIFconnectAttr->pu8bssid != NULL) {
-               kfree(pstrHostIFconnectAttr->pu8bssid);
-               pstrHostIFconnectAttr->pu8bssid = NULL;
+       if (pstrHostIFconnectAttr->bssid != NULL) {
+               kfree(pstrHostIFconnectAttr->bssid);
+               pstrHostIFconnectAttr->bssid = NULL;
        }
 
-       if (pstrHostIFconnectAttr->pu8ssid != NULL) {
-               kfree(pstrHostIFconnectAttr->pu8ssid);
-               pstrHostIFconnectAttr->pu8ssid = NULL;
+       if (pstrHostIFconnectAttr->ssid != NULL) {
+               kfree(pstrHostIFconnectAttr->ssid);
+               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,33 +3611,29 @@ 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 ;
 
        if (pu8bssid != NULL) {
-               msg.body.con_info.pu8bssid = kmalloc(6, GFP_KERNEL);
-               memcpy(msg.body.con_info.pu8bssid,
-                           pu8bssid, 6);
+               msg.body.con_info.bssid = kmalloc(6, GFP_KERNEL);
+               memcpy(msg.body.con_info.bssid, pu8bssid, 6);
        }
 
        if (pu8ssid != NULL) {
-               msg.body.con_info.ssidLen = ssidLen;
-               msg.body.con_info.pu8ssid = kmalloc(ssidLen, GFP_KERNEL);
-               memcpy(msg.body.con_info.pu8ssid,
-
-                           pu8ssid, 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;