| Message ID | 6fd3f34baa31c00a77e2805d5d8a820b3ac7a43f.1487912400.git.tahia.khan@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Kalle Valo |
| Headers | show |
On Fri, 24 Feb 2017, Tahia Khan wrote: > 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> Good job at cutting up the patch in a meaningful way. julia > --- > drivers/staging/wilc1000/coreconfigurator.h | 2 +- > drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 14 +++++++------- > 2 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h > index 9712d89..10101f8 100644 > --- 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 9601ab8..4a6fe90 100644 > --- 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; > -- > 2.7.4 > > -- > You received this message because you are subscribed to the Google Groups "outreachy-kernel" group. > To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com. > To post to this group, send email to outreachy-kernel@googlegroups.com. > To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/6fd3f34baa31c00a77e2805d5d8a820b3ac7a43f.1487912400.git.tahia.khan%40gmail.com. > For more options, visit https://groups.google.com/d/optout. >
diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h index 9712d89..10101f8 100644 --- 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 9601ab8..4a6fe90 100644 --- 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;
Change name of str_rssi to rssi_history within the network_info struct for clarity. Signed-off-by: Tahia Khan <tahia.khan@gmail.com> --- drivers/staging/wilc1000/coreconfigurator.h | 2 +- drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-)