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

Commit 441dc609 authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: remove typedef from tstrWILC_WFIDrv 



This patch removes typedef from the struct tstrWILC_WFIDrv and
rename it to host_if_drv.
This patch includes the removal of the comment for tstrWILC_WFIDrv as well.

Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarTony Cho <tony.cho@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0a589f4f

drivers/staging/wilc1000/host_interface.c

+173 −181

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/wilc1000/host_interface.h

+54 −54
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ enum p2p_listen_state { 
	P2P_GRP_FORMATION

};



typedef struct {

struct host_if_drv {

	/* Scan user structure */

	tstrWILC_UsrScanReq strWILC_UsrScanReq;
@@ -335,7 +335,7 @@ typedef struct { 
	struct timer_list hRemainOnChannel;



	bool IFC_UP;

} tstrWILC_WFIDrv;

};



/*!

 *  @enum               tenuWILC_StaFlag
@@ -391,7 +391,7 @@ struct add_sta_param { 
 *  @date		8 March 2012

 *  @version		1.0

 */

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

s32 host_int_remove_key(struct host_if_drv *hWFIDrv, const u8 *pu8StaAddress);

/**

 *  @brief              removes WEP key

 *  @details    valid only in BSS STA mode if External Supplicant support is enabled.
@@ -406,7 +406,7 @@ s32 host_int_remove_key(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8StaAddress); 
 *  @date		8 March 2012

 *  @version		1.0

 */

int host_int_remove_wep_key(tstrWILC_WFIDrv *wfi_drv, u8 index);

int host_int_remove_wep_key(struct host_if_drv *wfi_drv, u8 index);

/**

 *  @brief              sets WEP deafault key

 *  @details    Sets the index of the WEP encryption key in use,
@@ -419,7 +419,7 @@ int host_int_remove_wep_key(tstrWILC_WFIDrv *wfi_drv, u8 index); 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 host_int_set_WEPDefaultKeyID(tstrWILC_WFIDrv *hWFIDrv, u8 u8Index);

s32 host_int_set_WEPDefaultKeyID(struct host_if_drv *hWFIDrv, u8 u8Index);



/**

 *  @brief              sets WEP deafault key
@@ -440,7 +440,7 @@ s32 host_int_set_WEPDefaultKeyID(tstrWILC_WFIDrv *hWFIDrv, u8 u8Index); 
 *  @date		8 March 2012

 *  @version		1.0

 */

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

s32 host_int_add_wep_key_bss_sta(struct host_if_drv *hWFIDrv, const u8 *pu8WepKey, u8 u8WepKeylen, u8 u8Keyidx);

/**

 *  @brief              host_int_add_wep_key_bss_ap

 *  @details    valid only in AP mode if External Supplicant support is enabled.
@@ -455,7 +455,7 @@ s32 host_int_add_wep_key_bss_sta(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey, 
 *  @date		28 Feb 2013

 *  @version		1.0

 */

s32 host_int_add_wep_key_bss_ap(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey, u8 u8WepKeylen, u8 u8Keyidx, u8 u8mode, enum AUTHTYPE tenuAuth_type);

s32 host_int_add_wep_key_bss_ap(struct host_if_drv *hWFIDrv, const u8 *pu8WepKey, u8 u8WepKeylen, u8 u8Keyidx, u8 u8mode, enum AUTHTYPE tenuAuth_type);



/**

 *  @brief              adds ptk Key
@@ -473,7 +473,7 @@ s32 host_int_add_wep_key_bss_ap(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8WepKey, u 
 *  @date		8 March 2012

 *  @version		1.0

 */

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

s32 host_int_add_ptk(struct host_if_drv *hWFIDrv, const u8 *pu8Ptk, u8 u8PtkKeylen,

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



/**
@@ -488,7 +488,7 @@ s32 host_int_add_ptk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8Ptk, u8 u8PtkKeylen, 
 *  @date		15 April 2013

 *  @version		1.0

 */

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

s32 host_int_get_inactive_time(struct host_if_drv *hWFIDrv, const u8 *mac, u32 *pu32InactiveTime);



/**

 *  @brief              adds Rx GTk Key
@@ -506,7 +506,7 @@ s32 host_int_get_inactive_time(tstrWILC_WFIDrv *hWFIDrv, const u8 *mac, u32 *pu3 
 *  @date		8 March 2012

 *  @version		1.0

 */

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

s32 host_int_add_rx_gtk(struct host_if_drv *hWFIDrv, const u8 *pu8RxGtk, u8 u8GtkKeylen,

				u8 u8KeyIdx, u32 u32KeyRSClen, const u8 *KeyRSC,

				const u8 *pu8RxMic, const u8 *pu8TxMic, u8 mode, u8 u8Ciphermode);
@@ -527,7 +527,7 @@ s32 host_int_add_rx_gtk(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8RxGtk, u8 u8GtkKe 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 host_int_add_tx_gtk(tstrWILC_WFIDrv *hWFIDrv, u8 u8KeyLen, u8 *pu8TxGtk, u8 u8KeyIdx);

s32 host_int_add_tx_gtk(struct host_if_drv *hWFIDrv, u8 u8KeyLen, u8 *pu8TxGtk, u8 u8KeyIdx);



/**

 *  @brief              caches the pmkid
@@ -550,7 +550,7 @@ s32 host_int_add_tx_gtk(tstrWILC_WFIDrv *hWFIDrv, u8 u8KeyLen, u8 *pu8TxGtk, u8 
 *  @version		1.0

 */



s32 host_int_set_pmkid_info(tstrWILC_WFIDrv *hWFIDrv, struct host_if_pmkid_attr *pu8PmkidInfoArray);

s32 host_int_set_pmkid_info(struct host_if_drv *hWFIDrv, struct host_if_pmkid_attr *pu8PmkidInfoArray);

/**

 *  @brief              gets the cached the pmkid info

 *  @details    valid only in BSS STA mode if External Supplicant
@@ -574,7 +574,7 @@ s32 host_int_set_pmkid_info(tstrWILC_WFIDrv *hWFIDrv, struct host_if_pmkid_attr 
 *  @version		1.0

 */



s32 host_int_get_pmkid_info(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8PmkidInfoArray,

s32 host_int_get_pmkid_info(struct host_if_drv *hWFIDrv, u8 *pu8PmkidInfoArray,

				    u32 u32PmkidInfoLen);



/**
@@ -591,7 +591,7 @@ s32 host_int_get_pmkid_info(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8PmkidInfoArray, 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 host_int_set_RSNAConfigPSKPassPhrase(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8PassPhrase,

s32 host_int_set_RSNAConfigPSKPassPhrase(struct host_if_drv *hWFIDrv, u8 *pu8PassPhrase,

						 u8 u8Psklength);

/**

 *  @brief              gets the pass phrase
@@ -607,7 +607,7 @@ s32 host_int_set_RSNAConfigPSKPassPhrase(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8PassPh 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 host_int_get_RSNAConfigPSKPassPhrase(tstrWILC_WFIDrv *hWFIDrv,

s32 host_int_get_RSNAConfigPSKPassPhrase(struct host_if_drv *hWFIDrv,

						 u8 *pu8PassPhrase, u8 u8Psklength);



/**
@@ -621,7 +621,7 @@ s32 host_int_get_RSNAConfigPSKPassPhrase(tstrWILC_WFIDrv *hWFIDrv, 
 *  @date		19 April 2012

 *  @version		1.0

 */

s32 host_int_get_MacAddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8MacAddress);

s32 host_int_get_MacAddress(struct host_if_drv *hWFIDrv, u8 *pu8MacAddress);



/**

 *  @brief              sets mac address
@@ -634,7 +634,7 @@ s32 host_int_get_MacAddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8MacAddress); 
 *  @date		16 July 2012

 *  @version		1.0

 */

s32 host_int_set_MacAddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8MacAddress);

s32 host_int_set_MacAddress(struct host_if_drv *hWFIDrv, u8 *pu8MacAddress);



/**

 *  @brief              wait until msg q is empty
@@ -665,7 +665,7 @@ int host_int_wait_msg_queue_idle(void); 
 *  @version		1.0

 */



s32 host_int_set_start_scan_req(tstrWILC_WFIDrv *hWFIDrv, u8 scanSource);

s32 host_int_set_start_scan_req(struct host_if_drv *hWFIDrv, u8 scanSource);

/**

 *  @brief              gets scan source of the last scan

 *  @details
@@ -681,7 +681,7 @@ s32 host_int_set_start_scan_req(tstrWILC_WFIDrv *hWFIDrv, u8 scanSource); 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 host_int_get_start_scan_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8ScanSource);

s32 host_int_get_start_scan_req(struct host_if_drv *hWFIDrv, u8 *pu8ScanSource);



/**

 *  @brief              sets a join request
@@ -695,7 +695,7 @@ s32 host_int_get_start_scan_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8ScanSource); 
 *  @version		1.0

 */



s32 host_int_set_join_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8bssid,

s32 host_int_set_join_req(struct host_if_drv *hWFIDrv, u8 *pu8bssid,

				  const u8 *pu8ssid, size_t ssidLen,

				  const u8 *pu8IEs, size_t IEsLen,

				  wilc_connect_result pfConnectResult, void *pvUserArg,
@@ -715,7 +715,7 @@ s32 host_int_set_join_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8bssid, 
 *  @version		8.0

 */



s32 host_int_flush_join_req(tstrWILC_WFIDrv *hWFIDrv);

s32 host_int_flush_join_req(struct host_if_drv *hWFIDrv);





/**
@@ -729,7 +729,7 @@ s32 host_int_flush_join_req(tstrWILC_WFIDrv *hWFIDrv); 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 host_int_disconnect(tstrWILC_WFIDrv *hWFIDrv, u16 u16ReasonCode);

s32 host_int_disconnect(struct host_if_drv *hWFIDrv, u16 u16ReasonCode);



/**

 *  @brief              disconnects a sta
@@ -742,7 +742,7 @@ s32 host_int_disconnect(tstrWILC_WFIDrv *hWFIDrv, u16 u16ReasonCode); 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 host_int_disconnect_station(tstrWILC_WFIDrv *hWFIDrv, u8 assoc_id);

s32 host_int_disconnect_station(struct host_if_drv *hWFIDrv, u8 assoc_id);

/**

 *  @brief              gets a Association request info

 *  @details
@@ -769,7 +769,7 @@ s32 host_int_disconnect_station(tstrWILC_WFIDrv *hWFIDrv, u8 assoc_id); 
 *  @version		1.0

 */



s32 host_int_get_assoc_req_info(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8AssocReqInfo,

s32 host_int_get_assoc_req_info(struct host_if_drv *hWFIDrv, u8 *pu8AssocReqInfo,

					u32 u32AssocReqInfoLen);

/**

 *  @brief              gets a Association Response info
@@ -783,7 +783,7 @@ s32 host_int_get_assoc_req_info(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8AssocReqInfo, 
 *  @version		1.0

 */



s32 host_int_get_assoc_res_info(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8AssocRespInfo,

s32 host_int_get_assoc_res_info(struct host_if_drv *hWFIDrv, u8 *pu8AssocRespInfo,

					u32 u32MaxAssocRespInfoLen, u32 *pu32RcvdAssocRespInfoLen);

/**

 *  @brief              gets a Association Response info
@@ -800,7 +800,7 @@ s32 host_int_get_assoc_res_info(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8AssocRespInfo, 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 host_int_get_rx_power_level(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8RxPowerLevel,

s32 host_int_get_rx_power_level(struct host_if_drv *hWFIDrv, u8 *pu8RxPowerLevel,

					u32 u32RxPowerLevelLen);



/**
@@ -818,7 +818,7 @@ s32 host_int_get_rx_power_level(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8RxPowerLevel, 
 *  @date		8 March 2012

 *  @version		1.0

 */

int host_int_set_mac_chnl_num(tstrWILC_WFIDrv *wfi_drv, u8 channel);

int host_int_set_mac_chnl_num(struct host_if_drv *wfi_drv, u8 channel);



/**

 *  @brief              gets the current channel index
@@ -835,7 +835,7 @@ int host_int_set_mac_chnl_num(tstrWILC_WFIDrv *wfi_drv, u8 channel); 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 host_int_get_host_chnl_num(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8ChNo);

s32 host_int_get_host_chnl_num(struct host_if_drv *hWFIDrv, u8 *pu8ChNo);

/**

 *  @brief              gets the sta rssi

 *  @details    gets the currently maintained RSSI value for the station.
@@ -849,8 +849,8 @@ s32 host_int_get_host_chnl_num(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8ChNo); 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 host_int_get_rssi(tstrWILC_WFIDrv *hWFIDrv, s8 *ps8Rssi);

s32 host_int_get_link_speed(tstrWILC_WFIDrv *hWFIDrv, s8 *ps8lnkspd);

s32 host_int_get_rssi(struct host_if_drv *hWFIDrv, s8 *ps8Rssi);

s32 host_int_get_link_speed(struct host_if_drv *hWFIDrv, s8 *ps8lnkspd);

/**

 *  @brief              scans a set of channels

 *  @details
@@ -868,7 +868,7 @@ s32 host_int_get_link_speed(tstrWILC_WFIDrv *hWFIDrv, s8 *ps8lnkspd); 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 host_int_scan(tstrWILC_WFIDrv *hWFIDrv, u8 u8ScanSource,

s32 host_int_scan(struct host_if_drv *hWFIDrv, u8 u8ScanSource,

			  u8 u8ScanType, u8 *pu8ChnlFreqList,

			  u8 u8ChnlListLen, const u8 *pu8IEs,

			  size_t IEsLen, wilc_scan_result ScanResult,
@@ -885,7 +885,7 @@ s32 host_int_scan(tstrWILC_WFIDrv *hWFIDrv, u8 u8ScanSource, 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 hif_set_cfg(tstrWILC_WFIDrv *hWFIDrv, struct cfg_param_val *pstrCfgParamVal);

s32 hif_set_cfg(struct host_if_drv *hWFIDrv, struct cfg_param_val *pstrCfgParamVal);



/**

 *  @brief              gets configuration wids values
@@ -899,7 +899,7 @@ s32 hif_set_cfg(tstrWILC_WFIDrv *hWFIDrv, struct cfg_param_val *pstrCfgParamVal) 
 *  @date		8 March 2012

 *  @version		1.0

 */

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

s32 hif_get_cfg(struct host_if_drv *hWFIDrv, u16 u16WID, u16 *pu16WID_Value);

/*****************************************************************************/

/*							Notification Functions							 */

/*****************************************************************************/
@@ -946,7 +946,7 @@ void host_int_send_network_info_to_host 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv);

s32 host_int_init(struct host_if_drv **phWFIDrv);



/**

 *  @brief              host interface initialization function
@@ -957,7 +957,7 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv); 
 *  @date		8 March 2012

 *  @version		1.0

 */

s32 host_int_deinit(tstrWILC_WFIDrv *hWFIDrv);

s32 host_int_deinit(struct host_if_drv *hWFIDrv);





/*!
@@ -982,7 +982,7 @@ s32 host_int_deinit(tstrWILC_WFIDrv *hWFIDrv); 
 *  @version		1.0 Description

 *

 */

s32 host_int_add_beacon(tstrWILC_WFIDrv *hWFIDrv, u32 u32Interval,

s32 host_int_add_beacon(struct host_if_drv *hWFIDrv, u32 u32Interval,

				u32 u32DTIMPeriod,

				u32 u32HeadLen, u8 *pu8Head,

				u32 u32TailLen, u8 *pu8tail);
@@ -1000,7 +1000,7 @@ s32 host_int_add_beacon(tstrWILC_WFIDrv *hWFIDrv, u32 u32Interval, 
 *  @date		10 Julys 2012

 *  @version		1.0 Description

 */

s32 host_int_del_beacon(tstrWILC_WFIDrv *hWFIDrv);

s32 host_int_del_beacon(struct host_if_drv *hWFIDrv);



/*!

 *  @fn		s32 host_int_add_station(WILC_WFIDrvHandle hWFIDrv,
@@ -1016,7 +1016,7 @@ s32 host_int_del_beacon(tstrWILC_WFIDrv *hWFIDrv); 
 *  @date		12 July 2012

 *  @version		1.0 Description

 */

s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv,

s32 host_int_add_station(struct host_if_drv *hWFIDrv,

			 struct add_sta_param *pstrStaParams);



/*!
@@ -1032,7 +1032,7 @@ s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv, 
 *  @date		09 April 2014

 *  @version		1.0 Description

 */

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

s32 host_int_del_allstation(struct host_if_drv *hWFIDrv, u8 pu8MacAddr[][ETH_ALEN]);



/*!

 *  @fn		s32 host_int_del_station(WILC_WFIDrvHandle hWFIDrv, u8* pu8MacAddr)
@@ -1047,7 +1047,7 @@ s32 host_int_del_allstation(tstrWILC_WFIDrv *hWFIDrv, u8 pu8MacAddr[][ETH_ALEN]) 
 *  @date		15 July 2012

 *  @version		1.0 Description

 */

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

s32 host_int_del_station(struct host_if_drv *hWFIDrv, const u8 *pu8MacAddr);



/*!

 *  @fn		s32 host_int_edit_station(WILC_WFIDrvHandle hWFIDrv,
@@ -1063,7 +1063,7 @@ s32 host_int_del_station(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8MacAddr); 
 *  @date		15 July 2012

 *  @version		1.0 Description

 */

s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv,

s32 host_int_edit_station(struct host_if_drv *hWFIDrv,

			  struct add_sta_param *pstrStaParams);



/*!
@@ -1081,7 +1081,7 @@ s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv, 
 *  @date		24 November 2012

 *  @version		1.0 Description

 */

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

s32 host_int_set_power_mgmt(struct host_if_drv *hWFIDrv, bool bIsEnabled, u32 u32Timeout);

/*  @param[in,out]	hWFIDrv		handle to the wifi driver

 *  @param[in]	bIsEnabled	TRUE if enabled, FALSE otherwise

 *  @param[in]	u8count		count of mac address entries in the filter table
@@ -1093,7 +1093,7 @@ s32 host_int_set_power_mgmt(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u32 u32Ti 
 *  @date		24 November 2012

 *  @version		1.0 Description

 */

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

s32 host_int_setup_multicast_filter(struct host_if_drv *hWFIDrv, bool bIsEnabled, u32 u32count);

/**

 *  @brief           host_int_setup_ipaddress

 *  @details       set IP address on firmware
@@ -1103,7 +1103,7 @@ s32 host_int_setup_multicast_filter(tstrWILC_WFIDrv *hWFIDrv, bool bIsEnabled, u 
 *  @date

 *  @version	1.0

 */

s32 host_int_setup_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8IPAddr, u8 idx);

s32 host_int_setup_ipaddress(struct host_if_drv *hWFIDrv, u8 *pu8IPAddr, u8 idx);





/**
@@ -1115,7 +1115,7 @@ s32 host_int_setup_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8IPAddr, u8 idx); 
 *  @date

 *  @version	1.0

 */

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

s32 host_int_delBASession(struct host_if_drv *hWFIDrv, char *pBSSID, char TID);



/**

 *  @brief           host_int_delBASession
@@ -1126,7 +1126,7 @@ s32 host_int_delBASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char TID); 
 *  @date

 *  @version	1.0

 */

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

s32 host_int_del_All_Rx_BASession(struct host_if_drv *hWFIDrv, char *pBSSID, char TID);





/**
@@ -1138,7 +1138,7 @@ s32 host_int_del_All_Rx_BASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char T 
 *  @date

 *  @version	1.0

 */

s32 host_int_get_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8IPAddr, u8 idx);

s32 host_int_get_ipaddress(struct host_if_drv *hWFIDrv, u8 *pu8IPAddr, u8 idx);



/**

 *  @brief           host_int_remain_on_channel
@@ -1149,7 +1149,7 @@ s32 host_int_get_ipaddress(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8IPAddr, u8 idx); 
 *  @date

 *  @version	1.0

 */

s32 host_int_remain_on_channel(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID, u32 u32duration, u16 chan, wilc_remain_on_chan_expired RemainOnChanExpired, wilc_remain_on_chan_ready RemainOnChanReady, void *pvUserArg);

s32 host_int_remain_on_channel(struct host_if_drv *hWFIDrv, u32 u32SessionID, u32 u32duration, u16 chan, wilc_remain_on_chan_expired RemainOnChanExpired, wilc_remain_on_chan_ready RemainOnChanReady, void *pvUserArg);



/**

 *  @brief              host_int_ListenStateExpired
@@ -1165,7 +1165,7 @@ s32 host_int_remain_on_channel(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID, u32 u 
 *  @date

 *  @version		1.0

 */

s32 host_int_ListenStateExpired(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID);

s32 host_int_ListenStateExpired(struct host_if_drv *hWFIDrv, u32 u32SessionID);



/**

 *  @brief           host_int_frame_register
@@ -1176,7 +1176,7 @@ s32 host_int_ListenStateExpired(tstrWILC_WFIDrv *hWFIDrv, u32 u32SessionID); 
 *  @date

 *  @version	1.0

 */

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

s32 host_int_frame_register(struct host_if_drv *hWFIDrv, u16 u16FrameType, bool bReg);

/**

 *  @brief           host_int_set_wfi_drv_handler

 *  @details
@@ -1186,13 +1186,13 @@ s32 host_int_frame_register(tstrWILC_WFIDrv *hWFIDrv, u16 u16FrameType, bool bRe 
 *  @date

 *  @version	1.0

 */

int host_int_set_wfi_drv_handler(tstrWILC_WFIDrv *address);

int host_int_set_operation_mode(tstrWILC_WFIDrv *wfi_drv, u32 mode);

int host_int_set_wfi_drv_handler(struct host_if_drv *address);

int host_int_set_operation_mode(struct host_if_drv *wfi_drv, u32 mode);



static s32 Handle_ScanDone(tstrWILC_WFIDrv *drvHandler, tenuScanEvent enuEvent);

static s32 Handle_ScanDone(struct host_if_drv *drvHandler, tenuScanEvent enuEvent);



void host_int_freeJoinParams(void *pJoinParams);



s32 host_int_get_statistics(tstrWILC_WFIDrv *hWFIDrv, tstrStatistics *pstrStatistics);

s32 host_int_get_statistics(struct host_if_drv *hWFIDrv, tstrStatistics *pstrStatistics);



#endif

drivers/staging/wilc1000/linux_wlan.c

+8 −8
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event 
{

	struct in_ifaddr *dev_iface = (struct in_ifaddr *)ptr;

	struct wilc_priv *priv;

	tstrWILC_WFIDrv *pstrWFIDrv;

	struct host_if_drv *pstrWFIDrv;

	struct net_device *dev;

	u8 *pIP_Add_buff;

	perInterface_wlan_t *nic;
@@ -159,7 +159,7 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event 
		PRINT_D(GENERIC_DBG, "No Wireless Priv\n");

		return NOTIFY_DONE;

	}

	pstrWFIDrv = (tstrWILC_WFIDrv *)priv->hWILCWFIDrv;

	pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;

	nic = netdev_priv(dev);

	if (nic == NULL || pstrWFIDrv == NULL) {

		PRINT_D(GENERIC_DBG, "No Wireless Priv\n");
@@ -633,13 +633,13 @@ static int linux_wlan_init_test_config(struct net_device *dev, linux_wlan_t *p_n 
	unsigned char mac_add[] = {0x00, 0x80, 0xC2, 0x5E, 0xa2, 0xff};



	struct wilc_priv *priv;

	tstrWILC_WFIDrv *pstrWFIDrv;

	struct host_if_drv *pstrWFIDrv;



	PRINT_D(TX_DBG, "Start configuring Firmware\n");

	get_random_bytes(&mac_add[5], 1);

	get_random_bytes(&mac_add[4], 1);

	priv = wiphy_priv(dev->ieee80211_ptr->wiphy);

	pstrWFIDrv = (tstrWILC_WFIDrv *)priv->hWILCWFIDrv;

	pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;

	PRINT_D(INIT_DBG, "Host = %p\n", pstrWFIDrv);



	PRINT_D(INIT_DBG, "MAC address is : %02x-%02x-%02x-%02x-%02x-%02x\n", mac_add[0], mac_add[1], mac_add[2], mac_add[3], mac_add[4], mac_add[5]);
@@ -1364,11 +1364,11 @@ static void wilc_set_multicast_list(struct net_device *dev) 


	struct netdev_hw_addr *ha;

	struct wilc_priv *priv;

	tstrWILC_WFIDrv *pstrWFIDrv;

	struct host_if_drv *pstrWFIDrv;

	int i = 0;



	priv = wiphy_priv(dev->ieee80211_ptr->wiphy);

	pstrWFIDrv = (tstrWILC_WFIDrv *)priv->hWILCWFIDrv;

	pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;



	if (!dev)

		return;
@@ -1497,7 +1497,7 @@ int mac_close(struct net_device *ndev) 
{

	struct wilc_priv *priv;

	perInterface_wlan_t *nic;

	tstrWILC_WFIDrv *pstrWFIDrv;

	struct host_if_drv *pstrWFIDrv;



	nic = netdev_priv(ndev);
@@ -1513,7 +1513,7 @@ int mac_close(struct net_device *ndev) 
		return 0;

	}



	pstrWFIDrv = (tstrWILC_WFIDrv *)priv->hWILCWFIDrv;

	pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;



	PRINT_D(GENERIC_DBG, "Mac close\n");

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

+12 −12
Original line number Diff line number Diff line
@@ -539,14 +539,14 @@ static void CfgConnectResult(tenuConnDisconnEvent enuConnDisconnEvent, 
{

	struct wilc_priv *priv;

	struct net_device *dev;

	tstrWILC_WFIDrv *pstrWFIDrv;

	struct host_if_drv *pstrWFIDrv;

	u8 NullBssid[ETH_ALEN] = {0};



	connecting = 0;



	priv = (struct wilc_priv *)pUserVoid;

	dev = priv->dev;

	pstrWFIDrv = (tstrWILC_WFIDrv *)priv->hWILCWFIDrv;

	pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;



	if (enuConnDisconnEvent == CONN_DISCONN_EVENT_CONN_RESP) {

		/*Initialization*/
@@ -792,13 +792,13 @@ static int connect(struct wiphy *wiphy, struct net_device *dev, 
	char *pcwpa_version = NULL;



	struct wilc_priv *priv;

	tstrWILC_WFIDrv *pstrWFIDrv;

	struct host_if_drv *pstrWFIDrv;

	tstrNetworkInfo *pstrNetworkInfo = NULL;





	connecting = 1;

	priv = wiphy_priv(wiphy);

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

	pstrWFIDrv = (struct host_if_drv *)(priv->hWILCWFIDrv);



	host_int_set_wfi_drv_handler(priv->hWILCWFIDrv);
@@ -1034,14 +1034,14 @@ static int disconnect(struct wiphy *wiphy, struct net_device *dev, u16 reason_co 
{

	s32 s32Error = 0;

	struct wilc_priv *priv;

	tstrWILC_WFIDrv *pstrWFIDrv;

	struct host_if_drv *pstrWFIDrv;

	u8 NullBssid[ETH_ALEN] = {0};



	connecting = 0;

	priv = wiphy_priv(wiphy);



	/*Invalidate u8WLANChannel value on wlan0 disconnect*/

	pstrWFIDrv = (tstrWILC_WFIDrv *)priv->hWILCWFIDrv;

	pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;

	if (!pstrWFIDrv->u8P2PConnect)

		u8WLANChannel = INVALID_CHANNEL;

	linux_wlan_set_bssid(priv->dev, NullBssid);
@@ -1948,12 +1948,12 @@ void WILC_WFI_p2p_rx (struct net_device *dev, u8 *buff, u32 size) 


	struct wilc_priv *priv;

	u32 header, pkt_offset;

	tstrWILC_WFIDrv *pstrWFIDrv;

	struct host_if_drv *pstrWFIDrv;

	u32 i = 0;

	s32 s32Freq;



	priv = wiphy_priv(dev->ieee80211_ptr->wiphy);

	pstrWFIDrv = (tstrWILC_WFIDrv *)priv->hWILCWFIDrv;

	pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;



	/* Get WILC header */

	memcpy(&header, (buff - HOST_HDR_OFFSET), HOST_HDR_OFFSET);
@@ -2249,14 +2249,14 @@ static int mgmt_tx(struct wiphy *wiphy, 
	struct p2p_mgmt_data *mgmt_tx;

	struct wilc_priv *priv;

	s32 s32Error = 0;

	tstrWILC_WFIDrv *pstrWFIDrv;

	struct host_if_drv *pstrWFIDrv;

	u32 i;

	perInterface_wlan_t *nic;

	u32 buf_len = len + sizeof(u8P2P_vendorspec) + sizeof(u8P2Plocalrandom);



	nic = netdev_priv(wdev->netdev);

	priv = wiphy_priv(wiphy);

	pstrWFIDrv = (tstrWILC_WFIDrv *)priv->hWILCWFIDrv;

	pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;



	*cookie = (unsigned long)buf;

	priv->u64tx_cookie = *cookie;
@@ -2394,10 +2394,10 @@ static int mgmt_tx_cancel_wait(struct wiphy *wiphy, 
			       u64 cookie)

{

	struct wilc_priv *priv;

	tstrWILC_WFIDrv *pstrWFIDrv;

	struct host_if_drv *pstrWFIDrv;



	priv = wiphy_priv(wiphy);

	pstrWFIDrv = (tstrWILC_WFIDrv *)priv->hWILCWFIDrv;

	pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;





	PRINT_D(GENERIC_DBG, "Tx Cancel wait :%lu\n", jiffies);

drivers/staging/wilc1000/wilc_wfi_netdevice.h

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

	struct net_device *dev;

	struct napi_struct napi;

	tstrWILC_WFIDrv *hWILCWFIDrv;

	struct host_if_drv *hWILCWFIDrv;

	struct host_if_pmkid_attr pmkid_list;

	struct WILC_WFI_stats netstats;

	u8 WILC_WFI_wep_default;
@@ -151,7 +151,7 @@ typedef struct { 
typedef struct {

	u8 aSrcAddress[ETH_ALEN];

	u8 aBSSID[ETH_ALEN];

	tstrWILC_WFIDrv *drvHandler;

	struct host_if_drv *drvHandler;

	struct net_device *wilc_netdev;

} tstrInterfaceInfo;

typedef struct {