Commit 4b313e91 authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: renames u16BeaconPeriod of connect_resp_info structure 



This patch renames u16BeaconPeriod variable to beacon_period.

Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 38d3bb78

drivers/staging/wilc1000/coreconfigurator.c

+1 −1
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ s32 wilc_parse_network_info(u8 *msg_buffer, 


		index = MAC_HDR_LEN + TIME_STAMP_LEN;



		network_info->u16BeaconPeriod = get_beacon_period(msa + index);

		network_info->beacon_period = get_beacon_period(msa + index);



		index += BEACON_INTERVAL_LEN + CAP_INFO_LEN;

drivers/staging/wilc1000/coreconfigurator.h

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ struct network_info { 
	u8 ssid[MAX_SSID_LEN];

	u8 ssid_len;

	u8 bssid[6];

	u16 u16BeaconPeriod;

	u16 beacon_period;

	u8 u8DtimPeriod;

	u8 u8channel;

	unsigned long u32TimeRcvdInScanCached;

drivers/staging/wilc1000/host_interface.c

+1 −1
Original line number Diff line number Diff line
@@ -4276,7 +4276,7 @@ static void *host_int_ParseJoinBssParam(struct network_info *ptstrNetworkInfo) 
	pNewJoinBssParam = kzalloc(sizeof(struct join_bss_param), GFP_KERNEL);

	if (pNewJoinBssParam) {

		pNewJoinBssParam->dtim_period = ptstrNetworkInfo->u8DtimPeriod;

		pNewJoinBssParam->beacon_period = ptstrNetworkInfo->u16BeaconPeriod;

		pNewJoinBssParam->beacon_period = ptstrNetworkInfo->beacon_period;

		pNewJoinBssParam->cap_info = ptstrNetworkInfo->cap_info;

		memcpy(pNewJoinBssParam->au8bssid, ptstrNetworkInfo->bssid, 6);

		memcpy((u8 *)pNewJoinBssParam->ssid, ptstrNetworkInfo->ssid,

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

+4 −4
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ static void refresh_scan(void *user_void, u8 all, bool direct_scan) 
								  network_info->bssid,

								  network_info->u64Tsf,

								  network_info->cap_info,

								  network_info->u16BeaconPeriod,

								  network_info->beacon_period,

								  (const u8 *)network_info->pu8IEs,

								  (size_t)network_info->u16IEsLen,

								  (s32)rssi * 100,
@@ -373,7 +373,7 @@ static void add_network_to_shadow(struct network_info *pstrNetworkInfo, 
	       pstrNetworkInfo->ssid, pstrNetworkInfo->ssid_len);

	memcpy(last_scanned_shadow[ap_index].bssid,

	       pstrNetworkInfo->bssid, ETH_ALEN);

	last_scanned_shadow[ap_index].u16BeaconPeriod = pstrNetworkInfo->u16BeaconPeriod;

	last_scanned_shadow[ap_index].beacon_period = pstrNetworkInfo->beacon_period;

	last_scanned_shadow[ap_index].u8DtimPeriod = pstrNetworkInfo->u8DtimPeriod;

	last_scanned_shadow[ap_index].u8channel = pstrNetworkInfo->u8channel;

	last_scanned_shadow[ap_index].u16IEsLen = pstrNetworkInfo->u16IEsLen;
@@ -431,7 +431,7 @@ static void CfgScanResult(enum scan_event scan_event, 
					   channel->center_freq,

					   (s32)network_info->rssi * 100,

					   network_info->cap_info,

					   network_info->u16BeaconPeriod);

					   network_info->beacon_period);



				if (network_info->bNewNetwork) {

					if (priv->u32RcvdChCount < MAX_NUM_SCANNED_NETWORKS) {
@@ -449,7 +449,7 @@ static void CfgScanResult(enum scan_event scan_event, 
										  network_info->bssid,

										  network_info->u64Tsf,

										  network_info->cap_info,

										  network_info->u16BeaconPeriod,

										  network_info->beacon_period,

										  (const u8 *)network_info->pu8IEs,

										  (size_t)network_info->u16IEsLen,

										  (s32)network_info->rssi * 100,

CRA Git | Maintained and supported by SUSTech CRA and CCSE