staging: wilc1000: renames u8SsidLen of connect_resp_info structure

This patch renames u8SsidLen variable to ssid_len.

Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index 4dd7c8a9e9934d91cba85e2da894f570f56bae7c..273fad92e502939ab81930ad91db69e24c1a5d44 100644 (file)
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -322,7 +322,7 @@ s32 wilc_parse_network_info(u8 *msg_buffer,
 
                network_info->u64Tsf = tsf_lo | ((u64)tsf_hi << 32);
 
-               get_ssid(msa, network_info->ssid, &network_info->u8SsidLen);
+               get_ssid(msa, network_info->ssid, &network_info->ssid_len);
                get_BSSID(msa, network_info->au8bssid);
 
                network_info->u8channel = get_current_channel_802_11n(msa,

diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h
index 781a65ff369fddb049cfc874ab2e6240ae46a33c..39f3691918c8588772ad3313fb62ef29a41ec6b9 100644 (file)
--- a/drivers/staging/wilc1000/coreconfigurator.h
+++ b/drivers/staging/wilc1000/coreconfigurator.h
@@ -80,7 +80,7 @@ struct network_info {
        s8 rssi;
        u16 cap_info;
        u8 ssid[MAX_SSID_LEN];
-       u8 u8SsidLen;
+       u8 ssid_len;
        u8 au8bssid[6];
        u16 u16BeaconPeriod;
        u8 u8DtimPeriod;

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index c31f0b5b021ad3a0a608f8757d49d1ab2967f34e..f9a8a447c716d0ea973d449a577983623ca59d6e 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -4280,8 +4280,8 @@ static void *host_int_ParseJoinBssParam(struct network_info *ptstrNetworkInfo)
                pNewJoinBssParam->cap_info = ptstrNetworkInfo->cap_info;
                memcpy(pNewJoinBssParam->au8bssid, ptstrNetworkInfo->au8bssid, 6);
                memcpy((u8 *)pNewJoinBssParam->ssid, ptstrNetworkInfo->ssid,
-                      ptstrNetworkInfo->u8SsidLen + 1);
-               pNewJoinBssParam->ssid_len = ptstrNetworkInfo->u8SsidLen;
+                      ptstrNetworkInfo->ssid_len + 1);
+               pNewJoinBssParam->ssid_len = ptstrNetworkInfo->ssid_len;
                memset(pNewJoinBssParam->rsn_pcip_policy, 0xFF, 3);
                memset(pNewJoinBssParam->rsn_auth_policy, 0xFF, 3);
 

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 1caeff4e25c2f046dbbc14070fc7445f217da0d6..b5a97fd9e8c17228ebb1f25cca02d73a9f6c7430 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -368,9 +368,9 @@ static void add_network_to_shadow(struct network_info *pstrNetworkInfo,
        last_scanned_shadow[ap_index].strRssi.u8Index = rssi_index;
        last_scanned_shadow[ap_index].rssi = pstrNetworkInfo->rssi;
        last_scanned_shadow[ap_index].cap_info = pstrNetworkInfo->cap_info;
-       last_scanned_shadow[ap_index].u8SsidLen = pstrNetworkInfo->u8SsidLen;
+       last_scanned_shadow[ap_index].ssid_len = pstrNetworkInfo->ssid_len;
        memcpy(last_scanned_shadow[ap_index].ssid,
-              pstrNetworkInfo->ssid, pstrNetworkInfo->u8SsidLen);
+              pstrNetworkInfo->ssid, pstrNetworkInfo->ssid_len);
        memcpy(last_scanned_shadow[ap_index].au8bssid,
               pstrNetworkInfo->au8bssid, ETH_ALEN);
        last_scanned_shadow[ap_index].u16BeaconPeriod = pstrNetworkInfo->u16BeaconPeriod;
@@ -738,7 +738,7 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
        PRINT_INFO(CFG80211_DBG, "Required SSID = %s\n , AuthType = %d\n", sme->ssid, sme->auth_type);
 
        for (i = 0; i < last_scanned_cnt; i++) {
-               if ((sme->ssid_len == last_scanned_shadow[i].u8SsidLen) &&
+               if ((sme->ssid_len == last_scanned_shadow[i].ssid_len) &&
                    memcmp(last_scanned_shadow[i].ssid,
                           sme->ssid,
                           sme->ssid_len) == 0) {