openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Tahia Khan 2017-02-24 17:05:10 -05:00 committed by Greg Kroah-Hartman
parent 36d98c1898
commit 6d642eaa95
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/wilc1000/coreconfigurator.h
View File

@ -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;
};

14
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
View File

@ -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;