Commit e0f7d41e authored by Ajay Singh's avatar Ajay Singh Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: rename tsf_hi element of network_info struct 



Rename 'tsf_hi' element in network_info struct as it's not used to store
only the higher 32-bit value but the complete 64-bit tsf value.

Signed-off-by: default avatarAjay Singh <ajay.kathat@microchip.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 68b4f745

drivers/staging/wilc1000/host_interface.c

+4 −4
Original line number Diff line number Diff line
@@ -1098,14 +1098,14 @@ static s32 wilc_parse_network_info(u8 *msg_buffer, 
	if (ieee80211_is_probe_resp(mgt->frame_control)) {

		info->cap_info = le16_to_cpu(mgt->u.probe_resp.capab_info);

		info->beacon_period = le16_to_cpu(mgt->u.probe_resp.beacon_int);

		info->tsf_hi = le64_to_cpu(mgt->u.probe_resp.timestamp);

		info->tsf_lo = (u32)info->tsf_hi;

		info->tsf = le64_to_cpu(mgt->u.probe_resp.timestamp);

		info->tsf_lo = (u32)info->tsf;

		offset = offsetof(struct ieee80211_mgmt, u.probe_resp.variable);

	} else if (ieee80211_is_beacon(mgt->frame_control)) {

		info->cap_info = le16_to_cpu(mgt->u.beacon.capab_info);

		info->beacon_period = le16_to_cpu(mgt->u.beacon.beacon_int);

		info->tsf_hi = le64_to_cpu(mgt->u.beacon.timestamp);

		info->tsf_lo = (u32)info->tsf_hi;

		info->tsf = le64_to_cpu(mgt->u.beacon.timestamp);

		info->tsf_lo = (u32)info->tsf;

		offset = offsetof(struct ieee80211_mgmt, u.beacon.variable);

	} else {

		/* only process probe response and beacon frame */

drivers/staging/wilc1000/host_interface.h

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ struct network_info { 
	u16 ies_len;

	void *join_params;

	struct rssi_history_buffer rssi_history;

	u64 tsf_hi;

	u64 tsf;

};



struct connect_info {

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

+3 −3
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ static void refresh_scan(struct wilc_priv *priv, bool direct_scan) 
					  channel,

					  CFG80211_BSS_FTYPE_UNKNOWN,

					  network_info->bssid,

					  network_info->tsf_hi,

					  network_info->tsf,

					  network_info->cap_info,

					  network_info->beacon_period,

					  (const u8 *)network_info->ies,
@@ -308,7 +308,7 @@ static void add_network_to_shadow(struct network_info *nw_info, 
	shadow_nw_info->beacon_period = nw_info->beacon_period;

	shadow_nw_info->dtim_period = nw_info->dtim_period;

	shadow_nw_info->ch = nw_info->ch;

	shadow_nw_info->tsf_hi = nw_info->tsf_hi;

	shadow_nw_info->tsf = nw_info->tsf;

	if (ap_found != -1)

		kfree(shadow_nw_info->ies);

	shadow_nw_info->ies = kmemdup(nw_info->ies, nw_info->ies_len,
@@ -372,7 +372,7 @@ static void cfg_scan_result(enum scan_event scan_event, 
						  channel,

						  CFG80211_BSS_FTYPE_UNKNOWN,

						  network_info->bssid,

						  network_info->tsf_hi,

						  network_info->tsf,

						  network_info->cap_info,

						  network_info->beacon_period,

						  (const u8 *)network_info->ies,

CRA Git | Maintained and supported by SUSTech CRA and CCSE