Commit f2050a18 authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman

staging: wilc1000: renames strRssi of connect_resp_info structure

This patch renames strRssi variable to str_rssi.
Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cb64de7c
...@@ -93,7 +93,7 @@ struct network_info { ...@@ -93,7 +93,7 @@ struct network_info {
u8 *ies; u8 *ies;
u16 ies_len; u16 ies_len;
void *join_params; void *join_params;
tstrRSSI strRssi; tstrRSSI str_rssi;
u64 u64Tsf; u64 u64Tsf;
}; };
......
...@@ -210,10 +210,11 @@ static u32 get_rssi_avg(struct network_info *network_info) ...@@ -210,10 +210,11 @@ static u32 get_rssi_avg(struct network_info *network_info)
{ {
u8 i; u8 i;
int rssi_v = 0; 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++) 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; rssi_v /= num_rssi;
return rssi_v; return rssi_v;
...@@ -360,13 +361,13 @@ static void add_network_to_shadow(struct network_info *pstrNetworkInfo, ...@@ -360,13 +361,13 @@ static void add_network_to_shadow(struct network_info *pstrNetworkInfo,
} else { } else {
ap_index = ap_found; ap_index = ap_found;
} }
rssi_index = last_scanned_shadow[ap_index].strRssi.u8Index; rssi_index = last_scanned_shadow[ap_index].str_rssi.u8Index;
last_scanned_shadow[ap_index].strRssi.as8RSSI[rssi_index++] = pstrNetworkInfo->rssi; last_scanned_shadow[ap_index].str_rssi.as8RSSI[rssi_index++] = pstrNetworkInfo->rssi;
if (rssi_index == NUM_RSSI) { if (rssi_index == NUM_RSSI) {
rssi_index = 0; 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].rssi = pstrNetworkInfo->rssi;
last_scanned_shadow[ap_index].cap_info = pstrNetworkInfo->cap_info; last_scanned_shadow[ap_index].cap_info = pstrNetworkInfo->cap_info;
last_scanned_shadow[ap_index].ssid_len = pstrNetworkInfo->ssid_len; last_scanned_shadow[ap_index].ssid_len = pstrNetworkInfo->ssid_len;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment