Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57b298f5 authored by Chaehyun Lim's avatar Chaehyun Lim Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: remove WILC_Uint64 



Use u64 instead of WILC_Uint64.

Signed-off-by: default avatarChaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4e4467fd

drivers/staging/wilc1000/coreconfigurator.c

+1 −1
Original line number Diff line number Diff line
@@ -839,7 +839,7 @@ WILC_Sint32 ParseNetworkInfo(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInf 
		u32Tsf_Lo = get_beacon_timestamp_lo(pu8msa);

		u32Tsf_Hi = get_beacon_timestamp_hi(pu8msa);



		pstrNetworkInfo->u64Tsf = u32Tsf_Lo | ((WILC_Uint64)u32Tsf_Hi << 32);

		pstrNetworkInfo->u64Tsf = u32Tsf_Lo | ((u64)u32Tsf_Hi << 32);



		/* Get SSID */

		get_ssid(pu8msa, pstrNetworkInfo->au8ssid, &(pstrNetworkInfo->u8SsidLen));

drivers/staging/wilc1000/coreconfigurator.h

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ typedef struct { 
	u16 u16IEsLen;

	void *pJoinParams;

	tstrRSSI strRssi;

	WILC_Uint64 u64Tsf; /* time-stamp [Low and High 64 bit] */

	u64 u64Tsf; /* time-stamp [Low and High 64 bit] */

} tstrNetworkInfo;



/* This structure is used to support parsing of the received Association Response frame */

drivers/staging/wilc1000/host_interface.h

+1 −1
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ typedef struct { 
	/*Remain on channel struvture*/

	tstrHostIfRemainOnChan strHostIfRemainOnChan;

	u8 u8RemainOnChan_pendingreq;

	WILC_Uint64 u64P2p_MgmtTimeout;

	u64 u64P2p_MgmtTimeout;

	u8 u8P2PConnect;

	#endif

drivers/staging/wilc1000/wilc_oswrapper.h

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#define WILC_OSW_INTERFACE_VER 2



/* Integer Types */

typedef unsigned long long WILC_Uint64;

typedef signed char WILC_Sint8;

typedef signed short WILC_Sint16;

typedef signed int WILC_Sint32;

drivers/staging/wilc1000/wilc_wfi_netdevice.h

+2 −2
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ struct wilc_wfi_p2pListenParams { 
	struct ieee80211_channel *pstrListenChan;

	enum nl80211_channel_type tenuChannelType;

	u32 u32ListenDuration;

	WILC_Uint64 u64ListenCookie;

	u64 u64ListenCookie;

	u32 u32ListenSessionID;

};
@@ -130,7 +130,7 @@ struct WILC_WFI_priv { 


	#ifdef WILC_P2P

	struct wilc_wfi_p2pListenParams strRemainOnChanParams;

	WILC_Uint64 u64tx_cookie;

	u64 u64tx_cookie;



	#endif