staging: wilc1000: rename u16ConnectStatus in struct connect_info

This patch renames u16ConnectStatus to status 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 408031f..9fbd52b 100644 (file)
--- a/drivers/staging/wilc1000/coreconfigurator.h
+++ b/drivers/staging/wilc1000/coreconfigurator.h
@@ -111,7 +111,7 @@ struct connect_info {
        size_t req_ies_len;
        u8 *resp_ies;
        u16 resp_ies_len;
-       u16 u16ConnectStatus;
+       u16 status;
 };
 
 typedef struct {

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 58902bf..1ebe08a 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1463,9 +1463,9 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif,
                                        if (s32Err) {
                                                netdev_err(vif->ndev, "wilc_parse_assoc_resp_info() returned error %d\n", s32Err);
                                        } else {
-                                               strConnectInfo.u16ConnectStatus = pstrConnectRespInfo->status;
+                                               strConnectInfo.status = pstrConnectRespInfo->status;
 
-                                               if (strConnectInfo.u16ConnectStatus == SUCCESSFUL_STATUSCODE) {
+                                               if (strConnectInfo.status == SUCCESSFUL_STATUSCODE) {
                                                        if (pstrConnectRespInfo->ies) {
                                                                strConnectInfo.resp_ies_len = pstrConnectRespInfo->ies_len;
                                                                strConnectInfo.resp_ies = kmalloc(pstrConnectRespInfo->ies_len, GFP_KERNEL);
@@ -1483,7 +1483,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif,
                        }
 
                        if ((u8MacStatus == MAC_CONNECTED) &&
-                           (strConnectInfo.u16ConnectStatus != SUCCESSFUL_STATUSCODE)) {
+                           (strConnectInfo.status != SUCCESSFUL_STATUSCODE))   {
                                netdev_err(vif->ndev, "Received MAC status is MAC_CONNECTED while the received status code in Asoc Resp is not SUCCESSFUL_STATUSCODE\n");
                                eth_zero_addr(wilc_connected_ssid);
                        } else if (u8MacStatus == MAC_DISCONNECTED)    {
@@ -1495,7 +1495,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif,
                                memcpy(strConnectInfo.bssid, hif_drv->usr_conn_req.bssid, 6);
 
                                if ((u8MacStatus == MAC_CONNECTED) &&
-                                   (strConnectInfo.u16ConnectStatus == SUCCESSFUL_STATUSCODE)) {
+                                   (strConnectInfo.status == SUCCESSFUL_STATUSCODE))   {
                                        memcpy(hif_drv->assoc_bssid,
                                               hif_drv->usr_conn_req.bssid, ETH_ALEN);
                                }
@@ -1517,7 +1517,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif,
                                                          hif_drv->usr_conn_req.arg);
 
                        if ((u8MacStatus == MAC_CONNECTED) &&
-                           (strConnectInfo.u16ConnectStatus == SUCCESSFUL_STATUSCODE)) {
+                           (strConnectInfo.status == SUCCESSFUL_STATUSCODE))   {
                                wilc_set_power_mgmt(vif, 0, 0);
 
                                hif_drv->hif_state = HOST_IF_CONNECTED;

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 82bdaa6..cc615db 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -502,10 +502,10 @@ static void CfgConnectResult(enum conn_event enuConnDisconnEvent,
        if (enuConnDisconnEvent == CONN_DISCONN_EVENT_CONN_RESP) {
                u16 u16ConnectStatus;
 
-               u16ConnectStatus = pstrConnectInfo->u16ConnectStatus;
+               u16ConnectStatus = pstrConnectInfo->status;
 
                if ((u8MacStatus == MAC_DISCONNECTED) &&
-                   (pstrConnectInfo->u16ConnectStatus == SUCCESSFUL_STATUSCODE)) {
+                   (pstrConnectInfo->status == SUCCESSFUL_STATUSCODE)) {
                        u16ConnectStatus = WLAN_STATUS_UNSPECIFIED_FAILURE;
                        wilc_wlan_set_bssid(priv->dev, NullBssid,
                                            STATION_MODE);