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

staging: wilc1000: renames u64Tsf of connect_resp_info structure

This patch renames u64Tsf variable to tsf_hi.
Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f2050a18
...@@ -320,7 +320,7 @@ s32 wilc_parse_network_info(u8 *msg_buffer, ...@@ -320,7 +320,7 @@ s32 wilc_parse_network_info(u8 *msg_buffer,
tsf_lo = get_beacon_timestamp_lo(msa); tsf_lo = get_beacon_timestamp_lo(msa);
tsf_hi = get_beacon_timestamp_hi(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_ssid(msa, network_info->ssid, &network_info->ssid_len);
get_BSSID(msa, network_info->bssid); get_BSSID(msa, network_info->bssid);
......
...@@ -94,7 +94,7 @@ struct network_info { ...@@ -94,7 +94,7 @@ struct network_info {
u16 ies_len; u16 ies_len;
void *join_params; void *join_params;
tstrRSSI str_rssi; tstrRSSI str_rssi;
u64 u64Tsf; u64 tsf_hi;
}; };
struct connect_resp_info { struct connect_resp_info {
......
...@@ -251,7 +251,7 @@ static void refresh_scan(void *user_void, u8 all, bool direct_scan) ...@@ -251,7 +251,7 @@ static void refresh_scan(void *user_void, u8 all, bool direct_scan)
channel, channel,
CFG80211_BSS_FTYPE_UNKNOWN, CFG80211_BSS_FTYPE_UNKNOWN,
network_info->bssid, network_info->bssid,
network_info->u64Tsf, network_info->tsf_hi,
network_info->cap_info, network_info->cap_info,
network_info->beacon_period, network_info->beacon_period,
(const u8 *)network_info->ies, (const u8 *)network_info->ies,
...@@ -379,7 +379,7 @@ static void add_network_to_shadow(struct network_info *pstrNetworkInfo, ...@@ -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].dtim_period = pstrNetworkInfo->dtim_period;
last_scanned_shadow[ap_index].ch = pstrNetworkInfo->ch; last_scanned_shadow[ap_index].ch = pstrNetworkInfo->ch;
last_scanned_shadow[ap_index].ies_len = pstrNetworkInfo->ies_len; 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) if (ap_found != -1)
kfree(last_scanned_shadow[ap_index].ies); kfree(last_scanned_shadow[ap_index].ies);
last_scanned_shadow[ap_index].ies = kmalloc(pstrNetworkInfo->ies_len, last_scanned_shadow[ap_index].ies = kmalloc(pstrNetworkInfo->ies_len,
...@@ -449,7 +449,7 @@ static void CfgScanResult(enum scan_event scan_event, ...@@ -449,7 +449,7 @@ static void CfgScanResult(enum scan_event scan_event,
channel, channel,
CFG80211_BSS_FTYPE_UNKNOWN, CFG80211_BSS_FTYPE_UNKNOWN,
network_info->bssid, network_info->bssid,
network_info->u64Tsf, network_info->tsf_hi,
network_info->cap_info, network_info->cap_info,
network_info->beacon_period, network_info->beacon_period,
(const u8 *)network_info->ies, (const u8 *)network_info->ies,
......
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