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

Commit 0e1af73d authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

staging/wilc1000: use proper naming for global symbols 



There are many global symbols in the wilc1000 driver, some of them
with names like "DEBUG_LEVEL" or "probe" that are not acceptable
for globals in the linux kernel as they may easily conflict with other
(equally broken) drivers.

This renames all the globals that do not already start with
wilc or a variation of that to start with wilc_ and to follow
the usual naming conventions.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1608c403

drivers/staging/wilc1000/coreconfigurator.c

+5 −5
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ static u8 get_current_channel_802_11n(u8 *pu8msa, u16 u16RxLen) 
 *  @date			1 Mar 2012

 *  @version		1.0

 */

s32 parse_network_info(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo)

s32 wilc_parse_network_info(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo)

{

	tstrNetworkInfo *pstrNetworkInfo = NULL;

	u8 u8MsgType = 0;
@@ -466,7 +466,7 @@ s32 parse_network_info(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo) 
 *  @date		1 Mar 2012

 *  @version		1.0

 */

s32 DeallocateNetworkInfo(tstrNetworkInfo *pstrNetworkInfo)

s32 wilc_dealloc_network_info(tstrNetworkInfo *pstrNetworkInfo)

{

	s32 s32Error = 0;
@@ -499,7 +499,7 @@ s32 DeallocateNetworkInfo(tstrNetworkInfo *pstrNetworkInfo) 
 *  @date			2 Apr 2012

 *  @version		1.0

 */

s32 ParseAssocRespInfo(u8 *pu8Buffer, u32 u32BufferLen,

s32 wilc_parse_assoc_resp_info(u8 *pu8Buffer, u32 u32BufferLen,

			       tstrConnectRespInfo **ppstrConnectRespInfo)

{

	s32 s32Error = 0;
@@ -551,7 +551,7 @@ s32 ParseAssocRespInfo(u8 *pu8Buffer, u32 u32BufferLen, 
 *  @date			2 Apr 2012

 *  @version		1.0

 */

s32 DeallocateAssocRespInfo(tstrConnectRespInfo *pstrConnectRespInfo)

s32 wilc_dealloc_assoc_resp_info(tstrConnectRespInfo *pstrConnectRespInfo)

{

	s32 s32Error = 0;
@@ -588,7 +588,7 @@ s32 DeallocateAssocRespInfo(tstrConnectRespInfo *pstrConnectRespInfo) 
 *  @date		1 Mar 2012

 *  @version	1.0

 */

s32 send_config_pkt(u8 mode, struct wid *wids, u32 count, u32 drv)

s32 wilc_send_config_pkt(u8 mode, struct wid *wids, u32 count, u32 drv)

{

	s32 counter = 0, ret = 0;

drivers/staging/wilc1000/coreconfigurator.h

+8 −8
Original line number Diff line number Diff line
@@ -127,16 +127,16 @@ typedef struct { 
	size_t ie_len;

} tstrDisconnectNotifInfo;



s32 send_config_pkt(u8 mode, struct wid *wids, u32 count, u32 drv);

s32 parse_network_info(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo);

s32 DeallocateNetworkInfo(tstrNetworkInfo *pstrNetworkInfo);

s32 wilc_send_config_pkt(u8 mode, struct wid *wids, u32 count, u32 drv);

s32 wilc_parse_network_info(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo);

s32 wilc_dealloc_network_info(tstrNetworkInfo *pstrNetworkInfo);



s32 ParseAssocRespInfo(u8 *pu8Buffer, u32 u32BufferLen,

s32 wilc_parse_assoc_resp_info(u8 *pu8Buffer, u32 u32BufferLen,

		       tstrConnectRespInfo **ppstrConnectRespInfo);

s32 DeallocateAssocRespInfo(tstrConnectRespInfo *pstrConnectRespInfo);

s32 wilc_dealloc_assoc_resp_info(tstrConnectRespInfo *pstrConnectRespInfo);



void NetworkInfoReceived(u8 *pu8Buffer, u32 u32Length);

void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length);

void host_int_ScanCompleteReceived(u8 *pu8Buffer, u32 u32Length);

void wilc_network_info_received(u8 *pu8Buffer, u32 u32Length);

void wilc_gnrl_async_info_received(u8 *pu8Buffer, u32 u32Length);

void wilc_scan_complete_received(u8 *pu8Buffer, u32 u32Length);



#endif

drivers/staging/wilc1000/host_interface.c

+130 −130

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/wilc1000/host_interface.h

+41 −41
Original line number Diff line number Diff line
@@ -303,95 +303,95 @@ struct add_sta_param { 
	u16 flags_set;

};



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

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

int host_int_set_wep_default_key(struct host_if_drv *hif_drv, u8 index);

int host_int_add_wep_key_bss_sta(struct host_if_drv *hif_drv,

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

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

int wilc_set_wep_default_keyid(struct host_if_drv *hif_drv, u8 index);

int wilc_add_wep_key_bss_sta(struct host_if_drv *hif_drv,

				 const u8 *key, u8 len, u8 index);

int host_int_add_wep_key_bss_ap(struct host_if_drv *hif_drv,

int wilc_add_wep_key_bss_ap(struct host_if_drv *hif_drv,

				const u8 *key, u8 len, u8 index, u8 mode,

				enum AUTHTYPE auth_type);

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

s32 wilc_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);

s32 host_int_get_inactive_time(struct host_if_drv *hWFIDrv, const u8 *mac,

s32 wilc_get_inactive_time(struct host_if_drv *hWFIDrv, const u8 *mac,

			       u32 *pu32InactiveTime);

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

s32 wilc_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);

s32 host_int_add_tx_gtk(struct host_if_drv *hWFIDrv, u8 u8KeyLen,

s32 wilc_add_tx_gtk(struct host_if_drv *hWFIDrv, u8 u8KeyLen,

			u8 *pu8TxGtk, u8 u8KeyIdx);

s32 host_int_set_pmkid_info(struct host_if_drv *hWFIDrv,

s32 wilc_set_pmkid_info(struct host_if_drv *hWFIDrv,

			    struct host_if_pmkid_attr *pu8PmkidInfoArray);

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

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

int host_int_wait_msg_queue_idle(void);

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

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

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

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

int wilc_wait_msg_queue_idle(void);

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

s32 wilc_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,

			  u8 u8security, enum AUTHTYPE tenuAuth_type,

			  u8 u8channel, void *pJoinParams);

s32 host_int_flush_join_req(struct host_if_drv *hWFIDrv);

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

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

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

s32 host_int_scan(struct host_if_drv *hWFIDrv, u8 u8ScanSource,

s32 wilc_flush_join_req(struct host_if_drv *hWFIDrv);

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

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

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

s32 wilc_scan(struct host_if_drv *hWFIDrv, u8 u8ScanSource,

		  u8 u8ScanType, u8 *pu8ChnlFreqList,

		  u8 u8ChnlListLen, const u8 *pu8IEs,

		  size_t IEsLen, wilc_scan_result ScanResult,

		  void *pvUserArg, struct hidden_network *pstrHiddenNetwork);

s32 hif_set_cfg(struct host_if_drv *hWFIDrv,

s32 wilc_hif_set_cfg(struct host_if_drv *hWFIDrv,

		struct cfg_param_val *pstrCfgParamVal);

s32 host_int_init(struct net_device *dev, struct host_if_drv **phWFIDrv);

s32 host_int_deinit(struct host_if_drv *hWFIDrv);

s32 host_int_add_beacon(struct host_if_drv *hWFIDrv, u32 u32Interval,

s32 wilc_init(struct net_device *dev, struct host_if_drv **phWFIDrv);

s32 wilc_deinit(struct host_if_drv *hWFIDrv);

s32 wilc_add_beacon(struct host_if_drv *hWFIDrv, u32 u32Interval,

			u32 u32DTIMPeriod,

			u32 u32HeadLen,

			u8 *pu8Head,

			u32 u32TailLen,

			u8 *pu8tail);

int host_int_del_beacon(struct host_if_drv *hif_drv);

int host_int_add_station(struct host_if_drv *hif_drv,

int wilc_del_beacon(struct host_if_drv *hif_drv);

int wilc_add_station(struct host_if_drv *hif_drv,

			 struct add_sta_param *sta_param);

s32 host_int_del_allstation(struct host_if_drv *hWFIDrv,

s32 wilc_del_allstation(struct host_if_drv *hWFIDrv,

			    u8 pu8MacAddr[][ETH_ALEN]);

int host_int_del_station(struct host_if_drv *hif_drv, const u8 *mac_addr);

s32 host_int_edit_station(struct host_if_drv *hWFIDrv,

int wilc_del_station(struct host_if_drv *hif_drv, const u8 *mac_addr);

s32 wilc_edit_station(struct host_if_drv *hWFIDrv,

			  struct add_sta_param *pstrStaParams);

s32 host_int_set_power_mgmt(struct host_if_drv *hWFIDrv,

s32 wilc_set_power_mgmt(struct host_if_drv *hWFIDrv,

			    bool bIsEnabled,

			    u32 u32Timeout);

s32 host_int_setup_multicast_filter(struct host_if_drv *hWFIDrv,

s32 wilc_setup_multicast_filter(struct host_if_drv *hWFIDrv,

				    bool bIsEnabled,

				    u32 u32count);

s32 host_int_setup_ipaddress(struct host_if_drv *hWFIDrv,

s32 wilc_setup_ipaddress(struct host_if_drv *hWFIDrv,

			     u8 *pu8IPAddr,

			     u8 idx);

s32 host_int_del_All_Rx_BASession(struct host_if_drv *hWFIDrv,

s32 wilc_del_all_rx_ba_session(struct host_if_drv *hWFIDrv,

				  char *pBSSID,

				  char TID);

s32 host_int_remain_on_channel(struct host_if_drv *hWFIDrv,

s32 wilc_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);

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

s32 host_int_frame_register(struct host_if_drv *hWFIDrv,

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

s32 wilc_frame_register(struct host_if_drv *hWFIDrv,

			    u16 u16FrameType,

			    bool bReg);

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);

int wilc_set_wfi_drv_handler(struct host_if_drv *address);

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



void host_int_freeJoinParams(void *pJoinParams);

void wilc_free_join_params(void *pJoinParams);



s32 host_int_get_statistics(struct host_if_drv *hWFIDrv,

s32 wilc_get_statistics(struct host_if_drv *hWFIDrv,

			    struct rf_info *pstrStatistics);

void resolve_disconnect_aberration(struct host_if_drv *hif_drv);

void wilc_resolve_disconnect_aberration(struct host_if_drv *hif_drv);

#endif

drivers/staging/wilc1000/linux_mon.c

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ struct wilc_wfi_radiotap_cb_hdr { 


static struct net_device *wilc_wfi_mon; /* global monitor netdev */



extern int  mac_xmit(struct sk_buff *skb, struct net_device *dev);

extern int  wilc_mac_xmit(struct sk_buff *skb, struct net_device *dev);





static u8 srcAdd[6];
@@ -298,7 +298,7 @@ static netdev_tx_t WILC_WFI_mon_xmit(struct sk_buff *skb, 
		mon_mgmt_tx(mon_priv->real_ndev, skb->data, skb->len);

		dev_kfree_skb(skb);

	} else

		ret = mac_xmit(skb, mon_priv->real_ndev);

		ret = wilc_mac_xmit(skb, mon_priv->real_ndev);



	return ret;

}