diff mbox

[RESEND,65/70] staging: wilc1000: renames u64Tsf of connect_resp_info structure

Message ID 1454577871-667-26-git-send-email-glen.lee@atmel.com (mailing list archive)
State Not Applicable
Delegated to: Kalle Valo
Headers show

Commit Message

Glen Lee Feb. 4, 2016, 9:24 a.m. UTC 
From: Leo Kim <leo.kim@atmel.com>

This patch renames u64Tsf variable to tsf_hi.

Signed-off-by: Leo Kim <leo.kim@atmel.com>
---
 drivers/staging/wilc1000/coreconfigurator.c       | 2 +-
 drivers/staging/wilc1000/coreconfigurator.h       | 2 +-
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)
diff mbox

Patch

diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index cbca6a0..d481719 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -320,7 +320,7 @@  s32 wilc_parse_network_info(u8 *msg_buffer,
 		tsf_lo = get_beacon_timestamp_lo(msa);
 		tsf_hi = get_beacon_timestamp_hi(msa);
 
-		network_info->u64Tsf = tsf_lo | ((u64)tsf_hi << 32);
+		network_info->tsf_hi = tsf_lo | ((u64)tsf_hi << 32);
 
 		get_ssid(msa, network_info->ssid, &network_info->ssid_len);
 		get_BSSID(msa, network_info->bssid);
diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h
index 18c785b..748199d 100644
--- a/drivers/staging/wilc1000/coreconfigurator.h
+++ b/drivers/staging/wilc1000/coreconfigurator.h
@@ -94,7 +94,7 @@  struct network_info {
 	u16 ies_len;
 	void *join_params;
 	tstrRSSI str_rssi;
-	u64 u64Tsf;
+	u64 tsf_hi;
 };
 
 struct connect_resp_info {
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 6750700..f3b4a98 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -251,7 +251,7 @@  static void refresh_scan(void *user_void, u8 all, bool direct_scan)
 								  channel,
 								  CFG80211_BSS_FTYPE_UNKNOWN,
 								  network_info->bssid,
-								  network_info->u64Tsf,
+								  network_info->tsf_hi,
 								  network_info->cap_info,
 								  network_info->beacon_period,
 								  (const u8 *)network_info->ies,
@@ -379,7 +379,7 @@  static void add_network_to_shadow(struct network_info *pstrNetworkInfo,
 	last_scanned_shadow[ap_index].dtim_period = pstrNetworkInfo->dtim_period;
 	last_scanned_shadow[ap_index].ch = pstrNetworkInfo->ch;
 	last_scanned_shadow[ap_index].ies_len = pstrNetworkInfo->ies_len;
-	last_scanned_shadow[ap_index].u64Tsf = pstrNetworkInfo->u64Tsf;
+	last_scanned_shadow[ap_index].tsf_hi = pstrNetworkInfo->tsf_hi;
 	if (ap_found != -1)
 		kfree(last_scanned_shadow[ap_index].ies);
 	last_scanned_shadow[ap_index].ies = kmalloc(pstrNetworkInfo->ies_len,
@@ -449,7 +449,7 @@  static void CfgScanResult(enum scan_event scan_event,
 										  channel,
 										  CFG80211_BSS_FTYPE_UNKNOWN,
 										  network_info->bssid,
-										  network_info->u64Tsf,
+										  network_info->tsf_hi,
 										  network_info->cap_info,
 										  network_info->beacon_period,
 										  (const u8 *)network_info->ies,