Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1587307

[PATCH v3 3/3] staging: wilc1000: Rename network_info member str_rssi to rssi_history

Path csiph.com!aioe.org!news.servidellagleba.it!bofh.it!news.nic.it!robomod
From Tahia Khan <tahia.khan@gmail.com>
Newsgroups linux.kernel
Subject [PATCH v3 3/3] staging: wilc1000: Rename network_info member str_rssi to rssi_history
Date Fri, 24 Feb 2017 06:40:02 +0100
Message-ID <tegLM-3Zs-9@gated-at.bofh.it> (permalink)
References <tegLM-3Zs-3@gated-at.bofh.it>
X-Original-To outreachy-kernel@googlegroups.com, aditya.shankar@microchip.com, ganesh.krishna@microchip.com, gregkh@linuxfoundation.org, linux-wireless@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Dkim-Signature v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=fL6RBd79buMa3kRtyEgVUaWDUpW4y+Og1+VkrW9LQXM=; b=nxKv6ZL0ynJePo19s2ieb85MZfO6Ys9g7UW6FH4Fln3GshVFtNzaaG9bb1+3qc/NMd EsKRUpl07pe+tL4+OE8R4DDIEC3VGYK6k9ocYWf5irb1apz0GAxGK6mxbTuFQ9SY39Po zaIpaDhmvQlQBfZozVkKjk4G6VlgT1nfCUfQJEOpNZFrwqRz3T2YpZ4ha9SE8vcOOcmv lhUxkezybBgcFE22YXun8x7GNlZ9AL1Vxf+5jkchzKoqT9eYXfM+8WJQXakB6cvnBrES bqEs09PoHJjD9GqiUGS2pLRMuLprpdK1SNYAM1nz+BNn26FuO1K200xpiyUc0UH0ai9B kyZw==
X-Google-Dkim-Signature v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=fL6RBd79buMa3kRtyEgVUaWDUpW4y+Og1+VkrW9LQXM=; b=HHbKqExAGU1kG5qyX4zQKZ6g8N/ElPoEuqQApHMxeF+zKTGdMYtzkZXK9QYx6VjC3o 3fuUSMG3irkwrfT5bCiiHCL3PdPvY4/w6uGa7vliygf7L7alPwGj8xL3vD/cxHSWT1dK 0YQIGK0XszqQ54NpoS4kNAhbjxjGkk4e+xsAuFOWHPrPPxyGzRDEOJszvDe2hk83GQQm hMqXC+0Y7hmSEEkikytqxd9TrdbCgX8CgdAxy3KYPxJDDKE6GtTT4dYSPn4dXblmaOWI 2vlIV2IUxXdMV3/JaW883OUqWOQvg6DPbiVulplZpA/++tEnB8pHNu0ydcEKXOHBbLaw Yj2g==
X-Gm-Message-State AMke39lhpk0tdOOeod40g12F1x/yjCHCKcw7jNNY2yWYZx14LQMXx+e1CmazB1R+w70UBA==
X-Received by 10.36.81.142 with SMTP id s136mr1012510ita.119.1487914513682; Thu, 23 Feb 2017 21:35:13 -0800 (PST)
MIME-Version 1.0
Content-Type text/plain; charset=us-ascii
Content-Disposition inline
User-Agent Mutt/1.5.24 (2015-08-30)
Sender robomod@news.nic.it
List-ID <linux-kernel.vger.kernel.org>
X-Mailing-List linux-kernel@vger.kernel.org
Approved robomod@news.nic.it
Lines 60
Organization linux.* mail to news gateway
X-Original-Date Fri, 24 Feb 2017 00:35:12 -0500
X-Original-Message-ID <6fd3f34baa31c00a77e2805d5d8a820b3ac7a43f.1487912400.git.tahia.khan@gmail.com>
X-Original-References <cover.1487912400.git.tahia.khan@gmail.com>
X-Original-Sender linux-kernel-owner@vger.kernel.org
Xref csiph.com linux.kernel:1587307

Show key headers only | View raw


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(-)

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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH v3 0/3] staging: wilc1000: multiple coding style changes to  struct tstrRSSI Tahia Khan <tahia.khan@gmail.com> - 2017-02-24 06:40 +0100
  [PATCH v3 3/3] staging: wilc1000: Rename network_info member  str_rssi to rssi_history Tahia Khan <tahia.khan@gmail.com> - 2017-02-24 06:40 +0100
    Re: [Outreachy kernel] [PATCH v3 3/3] staging: wilc1000: Rename  network_info member str_rssi to rssi_history Julia Lawall <julia.lawall@lip6.fr> - 2017-02-24 07:40 +0100

csiph-web