staging: wilc1000: Rename network_info member str_rssi to rssi_history

Change name of str_rssi to rssi_history within the network_info
struct for clarity.

Signed-off-by: Tahia Khan <tahia.khan@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h
index 9712d89af05539c1b45135ba78a4fb039217b5a6..10101f83fc262394771c0f66d36c32b6b681526a 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;
-       struct rssi_history_buffer str_rssi;
+       struct rssi_history_buffer rssi_history;
        u64 tsf_hi;
 };
 

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 4f640e51740809c81d1d7be01305e4ea483c36c0..3197eacb166b6b34c19fc9de88a2e7896d4b11cb 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -205,11 +205,11 @@ static u32 get_rssi_avg(struct network_info *network_info)
 {
        u8 i;
        int rssi_v = 0;
-       u8 num_rssi = (network_info->str_rssi.full) ?
-                      NUM_RSSI : (network_info->str_rssi.index);
+       u8 num_rssi = (network_info->rssi_history.full) ?
+                      NUM_RSSI : (network_info->rssi_history.index);
 
        for (i = 0; i < num_rssi; i++)
-               rssi_v += network_info->str_rssi.samples[i];
+               rssi_v += network_info->rssi_history.samples[i];
 
        rssi_v /= num_rssi;
        return rssi_v;
@@ -346,13 +346,13 @@ static void add_network_to_shadow(struct network_info *pstrNetworkInfo,
        } else {
                ap_index = ap_found;
        }
-       rssi_index = last_scanned_shadow[ap_index].str_rssi.index;
-       last_scanned_shadow[ap_index].str_rssi.samples[rssi_index++] = pstrNetworkInfo->rssi;
+       rssi_index = last_scanned_shadow[ap_index].rssi_history.index;
+       last_scanned_shadow[ap_index].rssi_history.samples[rssi_index++] = pstrNetworkInfo->rssi;
        if (rssi_index == NUM_RSSI) {
                rssi_index = 0;
-               last_scanned_shadow[ap_index].str_rssi.full = true;
+               last_scanned_shadow[ap_index].rssi_history.full = true;
        }
-       last_scanned_shadow[ap_index].str_rssi.index = rssi_index;
+       last_scanned_shadow[ap_index].rssi_history.index = 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;