staging: wilc1000: renames strRssi of connect_resp_info structure

This patch renames strRssi variable to str_rssi.

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.h b/drivers/staging/wilc1000/coreconfigurator.h
index f154e39..18c785b 100644 (file)
--- a/drivers/staging/wilc1000/coreconfigurator.h
+++ b/drivers/staging/wilc1000/coreconfigurator.h
@@ -93,7 +93,7 @@ struct network_info {
        u8 *ies;
        u16 ies_len;
        void *join_params;
-       tstrRSSI strRssi;
+       tstrRSSI str_rssi;
        u64 u64Tsf;
 };
 

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 15f334a..30b1634 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -210,10 +210,11 @@ static u32 get_rssi_avg(struct network_info *network_info)
 {
        u8 i;
        int rssi_v = 0;
-       u8 num_rssi = (network_info->strRssi.u8Full) ? NUM_RSSI : (network_info->strRssi.u8Index);
+       u8 num_rssi = (network_info->str_rssi.u8Full) ?
+                      NUM_RSSI : (network_info->str_rssi.u8Index);
 
        for (i = 0; i < num_rssi; i++)
-               rssi_v += network_info->strRssi.as8RSSI[i];
+               rssi_v += network_info->str_rssi.as8RSSI[i];
 
        rssi_v /= num_rssi;
        return rssi_v;
@@ -360,13 +361,13 @@ static void add_network_to_shadow(struct network_info *pstrNetworkInfo,
        } else {
                ap_index = ap_found;
        }
-       rssi_index = last_scanned_shadow[ap_index].strRssi.u8Index;
-       last_scanned_shadow[ap_index].strRssi.as8RSSI[rssi_index++] = pstrNetworkInfo->rssi;
+       rssi_index = last_scanned_shadow[ap_index].str_rssi.u8Index;
+       last_scanned_shadow[ap_index].str_rssi.as8RSSI[rssi_index++] = pstrNetworkInfo->rssi;
        if (rssi_index == NUM_RSSI) {
                rssi_index = 0;
-               last_scanned_shadow[ap_index].strRssi.u8Full = 1;
+               last_scanned_shadow[ap_index].str_rssi.u8Full = 1;
        }
-       last_scanned_shadow[ap_index].strRssi.u8Index = rssi_index;
+       last_scanned_shadow[ap_index].str_rssi.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].ssid_len = pstrNetworkInfo->ssid_len;