staging: wilc1000: rename pu8ReqIEs in struct connect_info

This patch renames pu8ReqIEs to req_ies to avoid camelcase.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h
index a32f4660b7c7629021cc2971597fe4f1e96a683f..5ef4fd183eac177f988e119f7511dc39b816ad0e 100644 (file)
--- a/drivers/staging/wilc1000/coreconfigurator.h
+++ b/drivers/staging/wilc1000/coreconfigurator.h
@@ -107,7 +107,7 @@ struct connect_resp_info {
 
 struct connect_info {
        u8 bssid[6];
-       u8 *pu8ReqIEs;
+       u8 *req_ies;
        size_t ReqIEsLen;
        u8 *pu8RespIEs;
        u16 u16RespIEsLen;

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 4a1bad879ac714bb323e2a9a9310d902f3e3daca..55ed96e8b8dc4e3a49f47e4f19c46cbe664b657d 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1159,8 +1159,8 @@ ERRORHANDLER:
 
                        if (pstrHostIFconnectAttr->ies) {
                                strConnectInfo.ReqIEsLen = pstrHostIFconnectAttr->ies_len;
-                               strConnectInfo.pu8ReqIEs = kmalloc(pstrHostIFconnectAttr->ies_len, GFP_KERNEL);
-                               memcpy(strConnectInfo.pu8ReqIEs,
+                               strConnectInfo.req_ies = kmalloc(pstrHostIFconnectAttr->ies_len, GFP_KERNEL);
+                               memcpy(strConnectInfo.req_ies,
                                       pstrHostIFconnectAttr->ies,
                                       pstrHostIFconnectAttr->ies_len);
                        }
@@ -1171,8 +1171,8 @@ ERRORHANDLER:
                                                               NULL,
                                                               pstrHostIFconnectAttr->arg);
                        hif_drv->hif_state = HOST_IF_IDLE;
-                       kfree(strConnectInfo.pu8ReqIEs);
-                       strConnectInfo.pu8ReqIEs = NULL;
+                       kfree(strConnectInfo.req_ies);
+                       strConnectInfo.req_ies = NULL;
 
                } else {
                        netdev_err(vif->ndev, "Connect callback is NULL\n");
@@ -1266,8 +1266,8 @@ static s32 Handle_ConnectTimeout(struct wilc_vif *vif)
 
                if (hif_drv->usr_conn_req.ies) {
                        strConnectInfo.ReqIEsLen = hif_drv->usr_conn_req.ies_len;
-                       strConnectInfo.pu8ReqIEs = kmalloc(hif_drv->usr_conn_req.ies_len, GFP_KERNEL);
-                       memcpy(strConnectInfo.pu8ReqIEs,
+                       strConnectInfo.req_ies = kmalloc(hif_drv->usr_conn_req.ies_len, GFP_KERNEL);
+                       memcpy(strConnectInfo.req_ies,
                               hif_drv->usr_conn_req.ies,
                               hif_drv->usr_conn_req.ies_len);
                }
@@ -1278,8 +1278,8 @@ static s32 Handle_ConnectTimeout(struct wilc_vif *vif)
                                                  NULL,
                                                  hif_drv->usr_conn_req.arg);
 
-               kfree(strConnectInfo.pu8ReqIEs);
-               strConnectInfo.pu8ReqIEs = NULL;
+               kfree(strConnectInfo.req_ies);
+               strConnectInfo.req_ies = NULL;
        } else {
                netdev_err(vif->ndev, "Connect callback is NULL\n");
        }
@@ -1503,8 +1503,8 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif,
 
                        if (hif_drv->usr_conn_req.ies) {
                                strConnectInfo.ReqIEsLen = hif_drv->usr_conn_req.ies_len;
-                               strConnectInfo.pu8ReqIEs = kmalloc(hif_drv->usr_conn_req.ies_len, GFP_KERNEL);
-                               memcpy(strConnectInfo.pu8ReqIEs,
+                               strConnectInfo.req_ies = kmalloc(hif_drv->usr_conn_req.ies_len, GFP_KERNEL);
+                               memcpy(strConnectInfo.req_ies,
                                       hif_drv->usr_conn_req.ies,
                                       hif_drv->usr_conn_req.ies_len);
                        }
@@ -1533,8 +1533,8 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif,
                        kfree(strConnectInfo.pu8RespIEs);
                        strConnectInfo.pu8RespIEs = NULL;
 
-                       kfree(strConnectInfo.pu8ReqIEs);
-                       strConnectInfo.pu8ReqIEs = NULL;
+                       kfree(strConnectInfo.req_ies);
+                       strConnectInfo.req_ies = NULL;
                        hif_drv->usr_conn_req.ssid_len = 0;
                        kfree(hif_drv->usr_conn_req.ssid);
                        hif_drv->usr_conn_req.ssid = NULL;

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index fd16de547827a83373559d3f95c58a8f809a5fbc..6a546d4bb5bc57a1935a213a226d1109b490e1e0 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -544,7 +544,7 @@ static void CfgConnectResult(enum conn_event enuConnDisconnEvent,
                }
 
                cfg80211_connect_result(dev, pstrConnectInfo->bssid,
-                                       pstrConnectInfo->pu8ReqIEs, pstrConnectInfo->ReqIEsLen,
+                                       pstrConnectInfo->req_ies, pstrConnectInfo->ReqIEsLen,
                                        pstrConnectInfo->pu8RespIEs, pstrConnectInfo->u16RespIEsLen,
                                        u16ConnectStatus, GFP_KERNEL);
        } else if (enuConnDisconnEvent == CONN_DISCONN_EVENT_DISCONN_NOTIF)    {