Commit 218dc407 authored by Johnny Kim's avatar Johnny Kim Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: replace WILC_WFIDrvHandle by tstrWILC_WFIDrv 



The structure, WILC_WFIDrvHandle is used to save the pointer address
for the driver handler which is used throughout the driver but it's
not easy to understand what it means. In addition, it doesn't support
the 64 bit machine and also causes the warnings for the 64 bit build.

This patch replaces the WILC_WFIDrvHandle by the tstrWILC_WFIDrv
because the tstrWILC_WFIDrv is real structure to represent the driver
handler and reduces the 64 bit compile warnings. Also, typecasting to
WILC_WFIDrvHandle is not needed by using tstrWILC_WFIDrv as is.

Signed-off-by: default avatarJohnny Kim <johnny.kim@atmel.com>
Signed-off-by: default avatarTony Cho <tony.cho@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 598f85bf

drivers/staging/wilc1000/host_interface.c

+63 −63
Original line number Diff line number Diff line
@@ -751,7 +751,7 @@ s32 Handle_set_IPAddress(void *drvHandler, u8 *pu8IPAddr, u8 idx) 






	host_int_get_ipaddress((WILC_WFIDrvHandle)drvHandler, firmwareIPAddress, idx);

	host_int_get_ipaddress(drvHandler, firmwareIPAddress, idx);



	if (s32Error) {

		PRINT_D(HOSTINF_DBG, "Failed to set IP address\n");
@@ -801,7 +801,7 @@ s32 Handle_get_IPAddress(void *drvHandler, u8 *pu8IPAddr, u8 idx) 
	kfree(strWID.ps8WidVal);



	if (memcmp(gs8GetIP[idx], gs8SetIP[idx], IP_ALEN) != 0)

		host_int_setup_ipaddress((WILC_WFIDrvHandle)pstrWFIDrv, gs8SetIP[idx], idx);

		host_int_setup_ipaddress(pstrWFIDrv, gs8SetIP[idx], idx);



	if (s32Error != WILC_SUCCESS) {

		PRINT_ER("Failed to get IP address\n");
@@ -1497,7 +1497,7 @@ static s32 Handle_Connect(void *drvHandler, tstrHostIFconnectAttr *pstrHostIFcon 




	PRINT_D(HOSTINF_DBG, "Getting site survey results\n");

	s32Err = host_int_get_site_survey_results((WILC_WFIDrvHandle)pstrWFIDrv,

	s32Err = host_int_get_site_survey_results(pstrWFIDrv,

						  gapu8RcvdSurveyResults,

						  MAX_SURVEY_RESULT_FRAG_SIZE);

	if (s32Err) {
@@ -2402,7 +2402,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(void *drvHandler, tstrRcvdGnrlAsyncInfo *pst 
			if (u8MacStatus == MAC_CONNECTED) {

				memset(gapu8RcvdAssocResp, 0, MAX_ASSOC_RESP_FRAME_SIZE);



				host_int_get_assoc_res_info((WILC_WFIDrvHandle)pstrWFIDrv,

				host_int_get_assoc_res_info(pstrWFIDrv,

							    gapu8RcvdAssocResp,

							    MAX_ASSOC_RESP_FRAME_SIZE,

							    &u32RcvdAssocRespInfoLen);
@@ -2492,7 +2492,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(void *drvHandler, tstrRcvdGnrlAsyncInfo *pst 
			    (strConnectInfo.u16ConnectStatus == SUCCESSFUL_STATUSCODE))	{

				#ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP



				host_int_set_power_mgmt((WILC_WFIDrvHandle)pstrWFIDrv, 0, 0);

				host_int_set_power_mgmt(pstrWFIDrv, 0, 0);

				#endif



				PRINT_D(HOSTINF_DBG, "MAC status : CONNECTED and Connect Status : Successful\n");
@@ -2568,7 +2568,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(void *drvHandler, tstrRcvdGnrlAsyncInfo *pst 
				#ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP



				g_obtainingIP = false;

				host_int_set_power_mgmt((WILC_WFIDrvHandle)pstrWFIDrv, 0, 0);

				host_int_set_power_mgmt(pstrWFIDrv, 0, 0);

				#endif



				pstrWFIDrv->strWILC_UsrConnReq.pfUserConnectResult(CONN_DISCONN_EVENT_DISCONN_NOTIF,
@@ -3047,7 +3047,7 @@ static void Handle_Disconnect(void *drvHandler) 
	#ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP



	g_obtainingIP = false;

	host_int_set_power_mgmt((WILC_WFIDrvHandle)pstrWFIDrv, 0, 0);

	host_int_set_power_mgmt(pstrWFIDrv, 0, 0);

	#endif



	memset(u8ConnectedSSID, 0, ETH_ALEN);
@@ -3148,7 +3148,7 @@ void resolve_disconnect_aberration(void *drvHandler) 
		return;

	if ((pstrWFIDrv->enuHostIFstate == HOST_IF_WAITING_CONN_RESP) || (pstrWFIDrv->enuHostIFstate == HOST_IF_CONNECTING)) {

		PRINT_D(HOSTINF_DBG, "\n\n<< correcting Supplicant state machine >>\n\n");

		host_int_disconnect((WILC_WFIDrvHandle)pstrWFIDrv, 1);

		host_int_disconnect(pstrWFIDrv, 1);

	}

}

static s32 Switch_Log_Terminal(void *drvHandler)
@@ -4582,7 +4582,7 @@ static void TimerCB_Connect(void *pvArg) 
 *  @version		1.0

 */

/* Check implementation in core adding 9 bytes to the input! */

s32 host_int_remove_key(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8StaAddress)

s32 host_int_remove_key(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8StaAddress)

{

	s32 s32Error = WILC_SUCCESS;

	tstrWID strWID;
@@ -4611,7 +4611,7 @@ s32 host_int_remove_key(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8StaAddress) 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 host_int_remove_wep_key(WILC_WFIDrvHandle hWFIDrv, u8 u8keyIdx)

s32 host_int_remove_wep_key(tstrWILC_WFIDrv *hWFIDrv, u8 u8keyIdx)

{

	s32 s32Error = WILC_SUCCESS;

	tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
@@ -4660,7 +4660,7 @@ s32 host_int_remove_wep_key(WILC_WFIDrvHandle hWFIDrv, u8 u8keyIdx) 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 host_int_set_WEPDefaultKeyID(WILC_WFIDrvHandle hWFIDrv, u8 u8Index)

s32 host_int_set_WEPDefaultKeyID(tstrWILC_WFIDrv *hWFIDrv, u8 u8Index)

{

	s32 s32Error = WILC_SUCCESS;

	tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
@@ -4716,7 +4716,7 @@ s32 host_int_set_WEPDefaultKeyID(WILC_WFIDrvHandle hWFIDrv, u8 u8Index) 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 host_int_add_wep_key_bss_sta(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8WepKey, u8 u8WepKeylen, u8 u8Keyidx)

s32 host_int_add_wep_key_bss_sta(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey, u8 u8WepKeylen, u8 u8Keyidx)

{



	s32 s32Error = WILC_SUCCESS;
@@ -4781,7 +4781,7 @@ s32 host_int_add_wep_key_bss_sta(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8WepKey, 
 *  @date		28 FEB 2013

 *  @version		1.0

 */

s32 host_int_add_wep_key_bss_ap(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8WepKey, u8 u8WepKeylen, u8 u8Keyidx, u8 u8mode, AUTHTYPE_T tenuAuth_type)

s32 host_int_add_wep_key_bss_ap(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey, u8 u8WepKeylen, u8 u8Keyidx, u8 u8mode, AUTHTYPE_T tenuAuth_type)

{



	s32 s32Error = WILC_SUCCESS;
@@ -4856,7 +4856,7 @@ s32 host_int_add_wep_key_bss_ap(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8WepKey, 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 host_int_add_ptk(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8Ptk, u8 u8PtkKeylen,

s32 host_int_add_ptk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8Ptk, u8 u8PtkKeylen,

			     const u8 *mac_addr, const u8 *pu8RxMic, const u8 *pu8TxMic, u8 mode, u8 u8Ciphermode, u8 u8Idx)

{

	s32 s32Error = WILC_SUCCESS;
@@ -4956,7 +4956,7 @@ s32 host_int_add_ptk(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8Ptk, u8 u8PtkKeylen 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 host_int_add_rx_gtk(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8RxGtk, u8 u8GtkKeylen,

s32 host_int_add_rx_gtk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8RxGtk, u8 u8GtkKeylen,

				u8 u8KeyIdx, u32 u32KeyRSClen, const u8 *KeyRSC,

				const u8 *pu8RxMic, const u8 *pu8TxMic, u8 mode, u8 u8Ciphermode)

{
@@ -5063,7 +5063,7 @@ s32 host_int_add_rx_gtk(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8RxGtk, u8 u8GtkK 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 host_int_set_pmkid_info(WILC_WFIDrvHandle hWFIDrv, tstrHostIFpmkidAttr *pu8PmkidInfoArray)

s32 host_int_set_pmkid_info(tstrWILC_WFIDrv *hWFIDrv, tstrHostIFpmkidAttr *pu8PmkidInfoArray)

{

	s32 s32Error = WILC_SUCCESS;

	tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
@@ -5125,7 +5125,7 @@ s32 host_int_set_pmkid_info(WILC_WFIDrvHandle hWFIDrv, tstrHostIFpmkidAttr *pu8P 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 host_int_get_pmkid_info(WILC_WFIDrvHandle hWFIDrv, u8 *pu8PmkidInfoArray,

s32 host_int_get_pmkid_info(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8PmkidInfoArray,

				    u32 u32PmkidInfoLen)

{

	s32 s32Error = WILC_SUCCESS;
@@ -5154,7 +5154,7 @@ s32 host_int_get_pmkid_info(WILC_WFIDrvHandle hWFIDrv, u8 *pu8PmkidInfoArray, 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 host_int_set_RSNAConfigPSKPassPhrase(WILC_WFIDrvHandle hWFIDrv, u8 *pu8PassPhrase,

s32 host_int_set_RSNAConfigPSKPassPhrase(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8PassPhrase,

						 u8 u8Psklength)

{

	s32 s32Error = WILC_SUCCESS;
@@ -5181,7 +5181,7 @@ s32 host_int_set_RSNAConfigPSKPassPhrase(WILC_WFIDrvHandle hWFIDrv, u8 *pu8PassP 
 *  @date		19 April 2012

 *  @version		1.0

 */

s32 host_int_get_MacAddress(WILC_WFIDrvHandle hWFIDrv, u8 *pu8MacAddress)

s32 host_int_get_MacAddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8MacAddress)

{

	s32 s32Error = WILC_SUCCESS;

	tstrHostIFmsg strHostIFmsg;
@@ -5215,7 +5215,7 @@ s32 host_int_get_MacAddress(WILC_WFIDrvHandle hWFIDrv, u8 *pu8MacAddress) 
 *  @date		16 July 2012

 *  @version		1.0

 */

s32 host_int_set_MacAddress(WILC_WFIDrvHandle hWFIDrv, u8 *pu8MacAddress)

s32 host_int_set_MacAddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8MacAddress)

{

	s32 s32Error = WILC_SUCCESS;

	tstrHostIFmsg strHostIFmsg;
@@ -5256,7 +5256,7 @@ s32 host_int_set_MacAddress(WILC_WFIDrvHandle hWFIDrv, u8 *pu8MacAddress) 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 host_int_get_RSNAConfigPSKPassPhrase(WILC_WFIDrvHandle hWFIDrv,

s32 host_int_get_RSNAConfigPSKPassPhrase(tstrWILC_WFIDrv *hWFIDrv,

						 u8 *pu8PassPhrase, u8 u8Psklength)

{

	s32 s32Error = WILC_SUCCESS;
@@ -5303,7 +5303,7 @@ s32 host_int_get_RSNAConfigPSKPassPhrase(WILC_WFIDrvHandle hWFIDrv, 
 *  @version		1.0

 */

#ifndef CONNECT_DIRECT

s32 host_int_get_site_survey_results(WILC_WFIDrvHandle hWFIDrv,

s32 host_int_get_site_survey_results(tstrWILC_WFIDrv *hWFIDrv,

					     u8 ppu8RcvdSiteSurveyResults[][MAX_SURVEY_RESULT_FRAG_SIZE],

					     u32 u32MaxSiteSrvyFragLen)

{
@@ -5353,7 +5353,7 @@ s32 host_int_get_site_survey_results(WILC_WFIDrvHandle hWFIDrv, 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 host_int_set_start_scan_req(WILC_WFIDrvHandle hWFIDrv, u8 scanSource)

s32 host_int_set_start_scan_req(tstrWILC_WFIDrv *hWFIDrv, u8 scanSource)

{

	s32 s32Error = WILC_SUCCESS;

	tstrWID strWID;
@@ -5383,7 +5383,7 @@ s32 host_int_set_start_scan_req(WILC_WFIDrvHandle hWFIDrv, u8 scanSource) 
 *  @version		1.0

 */



s32 host_int_get_start_scan_req(WILC_WFIDrvHandle hWFIDrv, u8 *pu8ScanSource)

s32 host_int_get_start_scan_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8ScanSource)

{

	s32 s32Error = WILC_SUCCESS;

	tstrWID strWID;
@@ -5408,7 +5408,7 @@ s32 host_int_get_start_scan_req(WILC_WFIDrvHandle hWFIDrv, u8 *pu8ScanSource) 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 host_int_set_join_req(WILC_WFIDrvHandle hWFIDrv, u8 *pu8bssid,

s32 host_int_set_join_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8bssid,

				  const u8 *pu8ssid, size_t ssidLen,

				  const u8 *pu8IEs, size_t IEsLen,

				  tWILCpfConnectResult pfConnectResult, void *pvUserArg,
@@ -5509,7 +5509,7 @@ s32 host_int_set_join_req(WILC_WFIDrvHandle hWFIDrv, u8 *pu8bssid, 
 *  @version	8.0

 */



s32 host_int_flush_join_req(WILC_WFIDrvHandle hWFIDrv)

s32 host_int_flush_join_req(tstrWILC_WFIDrv *hWFIDrv)

{

	s32 s32Error = WILC_SUCCESS;

	tstrHostIFmsg strHostIFmsg;
@@ -5552,7 +5552,7 @@ s32 host_int_flush_join_req(WILC_WFIDrvHandle hWFIDrv) 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 host_int_disconnect(WILC_WFIDrvHandle hWFIDrv, u16 u16ReasonCode)

s32 host_int_disconnect(tstrWILC_WFIDrv *hWFIDrv, u16 u16ReasonCode)

{

	s32 s32Error = WILC_SUCCESS;

	tstrHostIFmsg strHostIFmsg;
@@ -5601,7 +5601,7 @@ s32 host_int_disconnect(WILC_WFIDrvHandle hWFIDrv, u16 u16ReasonCode) 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 host_int_disconnect_station(WILC_WFIDrvHandle hWFIDrv, u8 assoc_id)

s32 host_int_disconnect_station(tstrWILC_WFIDrv *hWFIDrv, u8 assoc_id)

{

	s32 s32Error = WILC_SUCCESS;

	tstrWID strWID;
@@ -5641,7 +5641,7 @@ s32 host_int_disconnect_station(WILC_WFIDrvHandle hWFIDrv, u8 assoc_id) 
 *  @version		1.0

 */



s32 host_int_get_assoc_req_info(WILC_WFIDrvHandle hWFIDrv, u8 *pu8AssocReqInfo,

s32 host_int_get_assoc_req_info(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8AssocReqInfo,

					u32 u32AssocReqInfoLen)

{

	s32 s32Error = WILC_SUCCESS;
@@ -5668,7 +5668,7 @@ s32 host_int_get_assoc_req_info(WILC_WFIDrvHandle hWFIDrv, u8 *pu8AssocReqInfo, 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 host_int_get_assoc_res_info(WILC_WFIDrvHandle hWFIDrv, u8 *pu8AssocRespInfo,

s32 host_int_get_assoc_res_info(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8AssocRespInfo,

					u32 u32MaxAssocRespInfoLen, u32 *pu32RcvdAssocRespInfoLen)

{

	s32 s32Error = WILC_SUCCESS;
@@ -5718,7 +5718,7 @@ s32 host_int_get_assoc_res_info(WILC_WFIDrvHandle hWFIDrv, u8 *pu8AssocRespInfo, 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 host_int_get_rx_power_level(WILC_WFIDrvHandle hWFIDrv, u8 *pu8RxPowerLevel,

s32 host_int_get_rx_power_level(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8RxPowerLevel,

					u32 u32RxPowerLevelLen)

{

	s32 s32Error = WILC_SUCCESS;
@@ -5749,7 +5749,7 @@ s32 host_int_get_rx_power_level(WILC_WFIDrvHandle hWFIDrv, u8 *pu8RxPowerLevel, 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 host_int_set_mac_chnl_num(WILC_WFIDrvHandle hWFIDrv, u8 u8ChNum)

s32 host_int_set_mac_chnl_num(tstrWILC_WFIDrv *hWFIDrv, u8 u8ChNum)

{

	s32 s32Error = WILC_SUCCESS;

	tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
@@ -5801,7 +5801,7 @@ s32 host_int_wait_msg_queue_idle(void) 


}



s32 host_int_set_wfi_drv_handler(u32 u32address)

s32 host_int_set_wfi_drv_handler(tstrWILC_WFIDrv *u32address)

{

	s32 s32Error = WILC_SUCCESS;
@@ -5828,7 +5828,7 @@ s32 host_int_set_wfi_drv_handler(u32 u32address) 






s32 host_int_set_operation_mode(WILC_WFIDrvHandle hWFIDrv, u32 u32mode)

s32 host_int_set_operation_mode(tstrWILC_WFIDrv *hWFIDrv, u32 u32mode)

{

	s32 s32Error = WILC_SUCCESS;
@@ -5868,7 +5868,7 @@ s32 host_int_set_operation_mode(WILC_WFIDrvHandle hWFIDrv, u32 u32mode) 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 host_int_get_host_chnl_num(WILC_WFIDrvHandle hWFIDrv, u8 *pu8ChNo)

s32 host_int_get_host_chnl_num(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8ChNo)

{

	s32 s32Error = WILC_SUCCESS;

	tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
@@ -5914,7 +5914,7 @@ s32 host_int_get_host_chnl_num(WILC_WFIDrvHandle hWFIDrv, u8 *pu8ChNo) 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 host_int_test_set_int_wid(WILC_WFIDrvHandle hWFIDrv, u32 u32TestMemAddr)

s32 host_int_test_set_int_wid(tstrWILC_WFIDrv *hWFIDrv, u32 u32TestMemAddr)

{

	s32 s32Error = WILC_SUCCESS;

	tstrWID	strWID;
@@ -5961,7 +5961,7 @@ s32 host_int_test_set_int_wid(WILC_WFIDrvHandle hWFIDrv, u32 u32TestMemAddr) 
 *  @date

 *  @version		1.0

 */

s32 host_int_get_inactive_time(WILC_WFIDrvHandle hWFIDrv, const u8 *mac, u32 *pu32InactiveTime)

s32 host_int_get_inactive_time(tstrWILC_WFIDrv *hWFIDrv, const u8 *mac, u32 *pu32InactiveTime)

{

	s32 s32Error = WILC_SUCCESS;

	tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
@@ -6007,7 +6007,7 @@ s32 host_int_get_inactive_time(WILC_WFIDrvHandle hWFIDrv, const u8 *mac, u32 *pu 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 host_int_test_get_int_wid(WILC_WFIDrvHandle hWFIDrv, u32 *pu32TestMemAddr)

s32 host_int_test_get_int_wid(tstrWILC_WFIDrv *hWFIDrv, u32 *pu32TestMemAddr)

{



	s32 s32Error = WILC_SUCCESS;
@@ -6056,7 +6056,7 @@ s32 host_int_test_get_int_wid(WILC_WFIDrvHandle hWFIDrv, u32 *pu32TestMemAddr) 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 host_int_get_rssi(WILC_WFIDrvHandle hWFIDrv, s8 *ps8Rssi)

s32 host_int_get_rssi(tstrWILC_WFIDrv *hWFIDrv, s8 *ps8Rssi)

{

	s32 s32Error = WILC_SUCCESS;

	tstrHostIFmsg strHostIFmsg;
@@ -6091,7 +6091,7 @@ s32 host_int_get_rssi(WILC_WFIDrvHandle hWFIDrv, s8 *ps8Rssi) 
	return s32Error;

}



s32 host_int_get_link_speed(WILC_WFIDrvHandle hWFIDrv, s8 *ps8lnkspd)

s32 host_int_get_link_speed(tstrWILC_WFIDrv *hWFIDrv, s8 *ps8lnkspd)

{

	tstrHostIFmsg strHostIFmsg;

	s32 s32Error = WILC_SUCCESS;
@@ -6128,7 +6128,7 @@ s32 host_int_get_link_speed(WILC_WFIDrvHandle hWFIDrv, s8 *ps8lnkspd) 
	return s32Error;

}



s32 host_int_get_statistics(WILC_WFIDrvHandle hWFIDrv, tstrStatistics *pstrStatistics)

s32 host_int_get_statistics(tstrWILC_WFIDrv *hWFIDrv, tstrStatistics *pstrStatistics)

{

	s32 s32Error = WILC_SUCCESS;

	tstrHostIFmsg strHostIFmsg;
@@ -6168,7 +6168,7 @@ s32 host_int_get_statistics(WILC_WFIDrvHandle hWFIDrv, tstrStatistics *pstrStati 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 host_int_scan(WILC_WFIDrvHandle hWFIDrv, u8 u8ScanSource,

s32 host_int_scan(tstrWILC_WFIDrv *hWFIDrv, u8 u8ScanSource,

			  u8 u8ScanType, u8 *pu8ChnlFreqList,

			  u8 u8ChnlListLen, const u8 *pu8IEs,

			  size_t IEsLen, tWILCpfScanResult ScanResult,
@@ -6241,7 +6241,7 @@ s32 host_int_scan(WILC_WFIDrvHandle hWFIDrv, u8 u8ScanSource, 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 hif_set_cfg(WILC_WFIDrvHandle hWFIDrv, tstrCfgParamVal *pstrCfgParamVal)

s32 hif_set_cfg(tstrWILC_WFIDrv *hWFIDrv, tstrCfgParamVal *pstrCfgParamVal)

{



	s32 s32Error = WILC_SUCCESS;
@@ -6282,7 +6282,7 @@ s32 hif_set_cfg(WILC_WFIDrvHandle hWFIDrv, tstrCfgParamVal *pstrCfgParamVal) 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 hif_get_cfg(WILC_WFIDrvHandle hWFIDrv, u16 u16WID, u16 *pu16WID_Value)

s32 hif_get_cfg(tstrWILC_WFIDrv *hWFIDrv, u16 u16WID, u16 *pu16WID_Value)

{

	s32 s32Error = WILC_SUCCESS;

	tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
@@ -6464,7 +6464,7 @@ static u32 u32Intialized; 
static u32 msgQ_created;

static u32 clients_count;



s32 host_int_init(WILC_WFIDrvHandle *phWFIDrv)

s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv)

{

	s32 s32Error = WILC_SUCCESS;

	tstrWILC_WFIDrv *pstrWFIDrv;
@@ -6493,7 +6493,7 @@ s32 host_int_init(WILC_WFIDrvHandle *phWFIDrv) 
	}

	memset(pstrWFIDrv, 0, sizeof(tstrWILC_WFIDrv));

	/*return driver handle to user*/

	*phWFIDrv = (WILC_WFIDrvHandle)pstrWFIDrv;

	*phWFIDrv = pstrWFIDrv;

	/*save into globl handle*/



	#ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP
@@ -6646,7 +6646,7 @@ _fail_: 
 *  @version		1.0

 */



s32 host_int_deinit(WILC_WFIDrvHandle hWFIDrv)

s32 host_int_deinit(tstrWILC_WFIDrv *hWFIDrv)

{

	s32 s32Error = WILC_SUCCESS;

	tstrHostIFmsg strHostIFmsg;
@@ -6696,7 +6696,7 @@ s32 host_int_deinit(WILC_WFIDrvHandle hWFIDrv) 
	WILC_TimerDestroy(&(pstrWFIDrv->hRemainOnChannel), NULL);

	#endif



	host_int_set_wfi_drv_handler((u32)NULL);

	host_int_set_wfi_drv_handler(NULL);

	down(&hSemDeinitDrvHandle);
@@ -6936,7 +6936,7 @@ void host_int_ScanCompleteReceived(u8 *pu8Buffer, u32 u32Length) 
 *  @date

 *  @version		1.0

 */

s32 host_int_remain_on_channel(WILC_WFIDrvHandle hWFIDrv, u32 u32SessionID, u32 u32duration, u16 chan, tWILCpfRemainOnChanExpired RemainOnChanExpired, tWILCpfRemainOnChanReady RemainOnChanReady, void *pvUserArg)

s32 host_int_remain_on_channel(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID, u32 u32duration, u16 chan, tWILCpfRemainOnChanExpired RemainOnChanExpired, tWILCpfRemainOnChanReady RemainOnChanReady, void *pvUserArg)

{

	s32 s32Error = WILC_SUCCESS;

	tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
@@ -6983,7 +6983,7 @@ s32 host_int_remain_on_channel(WILC_WFIDrvHandle hWFIDrv, u32 u32SessionID, u32 
 *  @date

 *  @version		1.0

 */

s32 host_int_ListenStateExpired(WILC_WFIDrvHandle hWFIDrv, u32 u32SessionID)

s32 host_int_ListenStateExpired(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID)

{

	s32 s32Error = WILC_SUCCESS;

	tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
@@ -7019,7 +7019,7 @@ s32 host_int_ListenStateExpired(WILC_WFIDrvHandle hWFIDrv, u32 u32SessionID) 
 *  @author

 *  @date

 *  @version		1.0*/

s32 host_int_frame_register(WILC_WFIDrvHandle hWFIDrv, u16 u16FrameType, bool bReg)

s32 host_int_frame_register(tstrWILC_WFIDrv *hWFIDrv, u16 u16FrameType, bool bReg)

{

	s32 s32Error = WILC_SUCCESS;

	tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
@@ -7077,7 +7077,7 @@ s32 host_int_frame_register(WILC_WFIDrvHandle hWFIDrv, u16 u16FrameType, bool bR 
 *  @date

 *  @version	1.0

 */

s32 host_int_add_beacon(WILC_WFIDrvHandle hWFIDrv, u32 u32Interval,

s32 host_int_add_beacon(tstrWILC_WFIDrv *hWFIDrv, u32 u32Interval,

				u32 u32DTIMPeriod,

				u32 u32HeadLen, u8 *pu8Head,

				u32 u32TailLen, u8 *pu8Tail)
@@ -7144,7 +7144,7 @@ s32 host_int_add_beacon(WILC_WFIDrvHandle hWFIDrv, u32 u32Interval, 
 *  @date

 *  @version	1.0

 */

s32 host_int_del_beacon(WILC_WFIDrvHandle hWFIDrv)

s32 host_int_del_beacon(tstrWILC_WFIDrv *hWFIDrv)

{

	s32 s32Error = WILC_SUCCESS;

	tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
@@ -7177,7 +7177,7 @@ s32 host_int_del_beacon(WILC_WFIDrvHandle hWFIDrv) 
 *  @date

 *  @version	1.0

 */

s32 host_int_add_station(WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaParam *pstrStaParams)

s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrStaParams)

{

	s32 s32Error = WILC_SUCCESS;

	tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
@@ -7227,7 +7227,7 @@ s32 host_int_add_station(WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaParam *pstrSt 
 *  @date

 *  @version	1.0

 */

s32 host_int_del_station(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8MacAddr)

s32 host_int_del_station(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8MacAddr)

{

	s32 s32Error = WILC_SUCCESS;

	tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
@@ -7271,7 +7271,7 @@ s32 host_int_del_station(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8MacAddr) 
 *  @date

 *  @version	1.0

 */

s32 host_int_del_allstation(WILC_WFIDrvHandle hWFIDrv, u8 pu8MacAddr[][ETH_ALEN])

s32 host_int_del_allstation(tstrWILC_WFIDrv *hWFIDrv, u8 pu8MacAddr[][ETH_ALEN])

{

	s32 s32Error = WILC_SUCCESS;

	tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
@@ -7333,7 +7333,7 @@ s32 host_int_del_allstation(WILC_WFIDrvHandle hWFIDrv, u8 pu8MacAddr[][ETH_ALEN] 
 *  @date

 *  @version	1.0

 */

s32 host_int_edit_station(WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaParam *pstrStaParams)

s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrStaParams)

{

	s32 s32Error = WILC_SUCCESS;

	tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
@@ -7372,7 +7372,7 @@ s32 host_int_edit_station(WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaParam *pstrS 
#endif /*WILC_AP_EXTERNAL_MLME*/

uint32_t wilc_get_chipid(uint8_t);



s32 host_int_set_power_mgmt(WILC_WFIDrvHandle hWFIDrv, bool bIsEnabled, u32 u32Timeout)

s32 host_int_set_power_mgmt(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u32 u32Timeout)

{

	s32 s32Error = WILC_SUCCESS;

	tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
@@ -7406,7 +7406,7 @@ s32 host_int_set_power_mgmt(WILC_WFIDrvHandle hWFIDrv, bool bIsEnabled, u32 u32T 
	return s32Error;

}



s32 host_int_setup_multicast_filter(WILC_WFIDrvHandle hWFIDrv, bool bIsEnabled, u32 u32count)

s32 host_int_setup_multicast_filter(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u32 u32count)

{

	s32 s32Error = WILC_SUCCESS;
@@ -7710,7 +7710,7 @@ static int host_int_addBASession(WILC_WFIDrvHandle hWFIDrv, char *pBSSID, char T 
}





s32 host_int_delBASession(WILC_WFIDrvHandle hWFIDrv, char *pBSSID, char TID)

s32 host_int_delBASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char TID)

{

	s32 s32Error = WILC_SUCCESS;

	tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
@@ -7743,7 +7743,7 @@ s32 host_int_delBASession(WILC_WFIDrvHandle hWFIDrv, char *pBSSID, char TID) 
	return s32Error;

}



s32 host_int_del_All_Rx_BASession(WILC_WFIDrvHandle hWFIDrv, char *pBSSID, char TID)

s32 host_int_del_All_Rx_BASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char TID)

{

	s32 s32Error = WILC_SUCCESS;

	tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
@@ -7784,7 +7784,7 @@ s32 host_int_del_All_Rx_BASession(WILC_WFIDrvHandle hWFIDrv, char *pBSSID, char 
 *  @author		Abdelrahman Sobhy

 *  @date

 *  @version		1.0*/

s32 host_int_setup_ipaddress(WILC_WFIDrvHandle hWFIDrv, u8 *u16ipadd, u8 idx)

s32 host_int_setup_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 *u16ipadd, u8 idx)

{

	s32 s32Error = WILC_SUCCESS;

	tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
@@ -7826,7 +7826,7 @@ s32 host_int_setup_ipaddress(WILC_WFIDrvHandle hWFIDrv, u8 *u16ipadd, u8 idx) 
 *  @author		Abdelrahman Sobhy

 *  @date

 *  @version		1.0*/

s32 host_int_get_ipaddress(WILC_WFIDrvHandle hWFIDrv, u8 *u16ipadd, u8 idx)

s32 host_int_get_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 *u16ipadd, u8 idx)

{

	s32 s32Error = WILC_SUCCESS;

	tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;

drivers/staging/wilc1000/host_interface.h

+52 −52

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/wilc1000/linux_wlan.c

+8 −8
Original line number Diff line number Diff line
@@ -291,13 +291,13 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event 
		}



		if (bEnablePS)

			host_int_set_power_mgmt((WILC_WFIDrvHandle)pstrWFIDrv, 1, 0);

			host_int_set_power_mgmt(pstrWFIDrv, 1, 0);



		PRINT_D(GENERIC_DBG, "[%s] Up IP\n", dev_iface->ifa_label);



		pIP_Add_buff = (char *) (&(dev_iface->ifa_address));

		PRINT_D(GENERIC_DBG, "IP add=%d:%d:%d:%d\n", pIP_Add_buff[0], pIP_Add_buff[1], pIP_Add_buff[2], pIP_Add_buff[3]);

		host_int_setup_ipaddress((WILC_WFIDrvHandle)pstrWFIDrv, pIP_Add_buff, nic->u8IfIdx);

		host_int_setup_ipaddress(pstrWFIDrv, pIP_Add_buff, nic->u8IfIdx);



		break;
@@ -311,7 +311,7 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event 
		}



		if (memcmp(dev_iface->ifa_label, wlan_dev_name, 5) == 0)

			host_int_set_power_mgmt((WILC_WFIDrvHandle)pstrWFIDrv, 0, 0);

			host_int_set_power_mgmt(pstrWFIDrv, 0, 0);



		resolve_disconnect_aberration(pstrWFIDrv);
@@ -320,7 +320,7 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event 
		pIP_Add_buff = null_ip;

		PRINT_D(GENERIC_DBG, "IP add=%d:%d:%d:%d\n", pIP_Add_buff[0], pIP_Add_buff[1], pIP_Add_buff[2], pIP_Add_buff[3]);



		host_int_setup_ipaddress((WILC_WFIDrvHandle)pstrWFIDrv, pIP_Add_buff, nic->u8IfIdx);

		host_int_setup_ipaddress(pstrWFIDrv, pIP_Add_buff, nic->u8IfIdx);



		break;
@@ -2007,7 +2007,7 @@ int mac_open(struct net_device *ndev) 
	for (i = 0; i < g_linux_wlan->u8NoIfcs; i++) {

		if (ndev == g_linux_wlan->strInterfaceInfo[i].wilc_netdev) {

			memcpy(g_linux_wlan->strInterfaceInfo[i].aSrcAddress, mac_add, ETH_ALEN);

			g_linux_wlan->strInterfaceInfo[i].drvHandler = (u32)priv->hWILCWFIDrv;

			g_linux_wlan->strInterfaceInfo[i].drvHandler = priv->hWILCWFIDrv;

			break;

		}

	}
@@ -2091,14 +2091,14 @@ static void wilc_set_multicast_list(struct net_device *dev) 
	if ((dev->flags & IFF_ALLMULTI) || (dev->mc.count) > WILC_MULTICAST_TABLE_SIZE) {

		PRINT_D(INIT_DBG, "Disable multicast filter, retrive all multicast packets\n");

		/* get all multicast packets */

		host_int_setup_multicast_filter((WILC_WFIDrvHandle)pstrWFIDrv, false, 0);

		host_int_setup_multicast_filter(pstrWFIDrv, false, 0);

		return;

	}



	/* No multicast?  Just get our own stuff */

	if ((dev->mc.count) == 0) {

		PRINT_D(INIT_DBG, "Enable multicast filter, retrive directed packets only.\n");

		host_int_setup_multicast_filter((WILC_WFIDrvHandle)pstrWFIDrv, true, 0);

		host_int_setup_multicast_filter(pstrWFIDrv, true, 0);

		return;

	}
@@ -2111,7 +2111,7 @@ static void wilc_set_multicast_list(struct net_device *dev) 
		i++;

	}



	host_int_setup_multicast_filter((WILC_WFIDrvHandle)pstrWFIDrv, true, (dev->mc.count));

	host_int_setup_multicast_filter(pstrWFIDrv, true, (dev->mc.count));



	return;

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

+11 −11
Original line number Diff line number Diff line
@@ -734,7 +734,7 @@ static int WILC_WFI_CfgScan(struct wiphy *wiphy, struct cfg80211_scan_request *r 


	priv->u32RcvdChCount = 0;



	host_int_set_wfi_drv_handler((u32)priv->hWILCWFIDrv);

	host_int_set_wfi_drv_handler(priv->hWILCWFIDrv);





	reset_shadow_found(priv);
@@ -829,7 +829,7 @@ static int WILC_WFI_CfgConnect(struct wiphy *wiphy, struct net_device *dev, 
	priv = wiphy_priv(wiphy);

	pstrWFIDrv = (tstrWILC_WFIDrv *)(priv->hWILCWFIDrv);



	host_int_set_wfi_drv_handler((u32)priv->hWILCWFIDrv);

	host_int_set_wfi_drv_handler(priv->hWILCWFIDrv);



	PRINT_D(CFG80211_DBG, "Connecting to SSID [%s] on netdev [%p] host if [%p]\n", sme->ssid, dev, priv->hWILCWFIDrv);

	#ifdef WILC_P2P
@@ -2887,15 +2887,15 @@ static int WILC_WFI_change_virt_intf(struct wiphy *wiphy, struct net_device *dev 


			/*Setting interface 1 drv handler and mac address in newly downloaded FW*/

			host_int_set_wfi_drv_handler(g_linux_wlan->strInterfaceInfo[0].drvHandler);

			host_int_set_MacAddress((WILC_WFIDrvHandle)(g_linux_wlan->strInterfaceInfo[0].drvHandler),

			host_int_set_MacAddress(g_linux_wlan->strInterfaceInfo[0].drvHandler,

						g_linux_wlan->strInterfaceInfo[0].aSrcAddress);

			host_int_set_operation_mode(priv->hWILCWFIDrv, STATION_MODE);



			/*Add saved WEP keys, if any*/

			if (g_wep_keys_saved) {

				host_int_set_WEPDefaultKeyID((WILC_WFIDrvHandle)(g_linux_wlan->strInterfaceInfo[0].drvHandler),

				host_int_set_WEPDefaultKeyID(g_linux_wlan->strInterfaceInfo[0].drvHandler,

							     g_key_wep_params.key_idx);

				host_int_add_wep_key_bss_sta((WILC_WFIDrvHandle)(g_linux_wlan->strInterfaceInfo[0].drvHandler),

				host_int_add_wep_key_bss_sta(g_linux_wlan->strInterfaceInfo[0].drvHandler,

							     g_key_wep_params.key,

							     g_key_wep_params.key_len,

							     g_key_wep_params.key_idx);
@@ -2973,15 +2973,15 @@ static int WILC_WFI_change_virt_intf(struct wiphy *wiphy, struct net_device *dev 
			g_wilc_initialized = 1;



			host_int_set_wfi_drv_handler(g_linux_wlan->strInterfaceInfo[0].drvHandler);

			host_int_set_MacAddress((WILC_WFIDrvHandle)(g_linux_wlan->strInterfaceInfo[0].drvHandler),

			host_int_set_MacAddress(g_linux_wlan->strInterfaceInfo[0].drvHandler,

						g_linux_wlan->strInterfaceInfo[0].aSrcAddress);

			host_int_set_operation_mode(priv->hWILCWFIDrv, STATION_MODE);



			/*Add saved WEP keys, if any*/

			if (g_wep_keys_saved) {

				host_int_set_WEPDefaultKeyID((WILC_WFIDrvHandle)(g_linux_wlan->strInterfaceInfo[0].drvHandler),

				host_int_set_WEPDefaultKeyID(g_linux_wlan->strInterfaceInfo[0].drvHandler,

							     g_key_wep_params.key_idx);

				host_int_add_wep_key_bss_sta((WILC_WFIDrvHandle)(g_linux_wlan->strInterfaceInfo[0].drvHandler),

				host_int_add_wep_key_bss_sta(g_linux_wlan->strInterfaceInfo[0].drvHandler,

							     g_key_wep_params.key,

							     g_key_wep_params.key_len,

							     g_key_wep_params.key_idx);
@@ -3101,15 +3101,15 @@ static int WILC_WFI_change_virt_intf(struct wiphy *wiphy, struct net_device *dev 


		/*Setting interface 1 drv handler and mac address in newly downloaded FW*/

		host_int_set_wfi_drv_handler(g_linux_wlan->strInterfaceInfo[0].drvHandler);

		host_int_set_MacAddress((WILC_WFIDrvHandle)(g_linux_wlan->strInterfaceInfo[0].drvHandler),

		host_int_set_MacAddress(g_linux_wlan->strInterfaceInfo[0].drvHandler,

					g_linux_wlan->strInterfaceInfo[0].aSrcAddress);

		host_int_set_operation_mode(priv->hWILCWFIDrv, AP_MODE);



		/*Add saved WEP keys, if any*/

		if (g_wep_keys_saved) {

			host_int_set_WEPDefaultKeyID((WILC_WFIDrvHandle)(g_linux_wlan->strInterfaceInfo[0].drvHandler),

			host_int_set_WEPDefaultKeyID(g_linux_wlan->strInterfaceInfo[0].drvHandler,

						     g_key_wep_params.key_idx);

			host_int_add_wep_key_bss_sta((WILC_WFIDrvHandle)(g_linux_wlan->strInterfaceInfo[0].drvHandler),

			host_int_add_wep_key_bss_sta(g_linux_wlan->strInterfaceInfo[0].drvHandler,

						     g_key_wep_params.key,

						     g_key_wep_params.key_len,

						     g_key_wep_params.key_idx);

drivers/staging/wilc1000/wilc_wfi_netdevice.h

+2 −2
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ struct WILC_WFI_priv { 
	spinlock_t lock;

	struct net_device *dev;

	struct napi_struct napi;

	WILC_WFIDrvHandle hWILCWFIDrv;

	tstrWILC_WFIDrv *hWILCWFIDrv;

	WILC_WFIDrvHandle hWILCWFIDrv_2;

	tstrHostIFpmkidAttr pmkid_list;

	struct WILC_WFI_stats netstats;
@@ -176,7 +176,7 @@ typedef struct { 
typedef struct {

	uint8_t aSrcAddress[ETH_ALEN];

	uint8_t aBSSID[ETH_ALEN];

	uint32_t drvHandler;

	tstrWILC_WFIDrv *drvHandler;

	struct net_device *wilc_netdev;

} tstrInterfaceInfo;

typedef struct {

CRA Git | Maintained and supported by SUSTech CRA and CCSE