rtl8188eu: Remove __func_enter__ and __func_exit__

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-01-26 16:20:25 -06:00
parent 19da086afe
commit a8e1fbf1f9
27 changed files with 691 additions and 691 deletions

View file

@ -51,7 +51,7 @@ sint _rtw_init_mlme_priv (struct adapter* padapter)
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
sint res = _SUCCESS;
_func_enter_;
;
// We don't need to memset padapter->XXX to zero, because adapter is allocated by rtw_zvmalloc().
//_rtw_memset((u8 *)pmlmepriv, 0, sizeof(struct mlme_priv));
@ -102,7 +102,7 @@ _func_enter_;
exit:
_func_exit_;
;
return res;
}
@ -154,7 +154,7 @@ void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv)
void _rtw_free_mlme_priv (struct mlme_priv *pmlmepriv)
{
_func_enter_;
;
rtw_free_mlme_priv_ie_data(pmlmepriv);
@ -165,14 +165,14 @@ _func_enter_;
rtw_vmfree(pmlmepriv->free_bss_buf, MAX_BSS_CNT * sizeof(struct wlan_network));
}
}
_func_exit_;
;
}
sint _rtw_enqueue_network(_queue *queue, struct wlan_network *pnetwork)
{
_irqL irqL;
_func_enter_;
;
if (pnetwork == NULL)
goto exit;
@ -185,7 +185,7 @@ _func_enter_;
exit:
_func_exit_;
;
return _SUCCESS;
}
@ -196,7 +196,7 @@ struct wlan_network *_rtw_dequeue_network(_queue *queue)
struct wlan_network *pnetwork;
_func_enter_;
;
_enter_critical_bh(&queue->lock, &irqL);
@ -213,7 +213,7 @@ _func_enter_;
_exit_critical_bh(&queue->lock, &irqL);
_func_exit_;
;
return pnetwork;
}
@ -225,7 +225,7 @@ struct wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv )//(_queue *
_queue *free_queue = &pmlmepriv->free_bss_pool;
_list* plist = NULL;
_func_enter_;
;
_enter_critical_bh(&free_queue->lock, &irqL);
@ -251,7 +251,7 @@ _func_enter_;
exit:
_exit_critical_bh(&free_queue->lock, &irqL);
_func_exit_;
;
return pnetwork;
}
@ -263,7 +263,7 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv ,struct wlan_network *pnetwor
_irqL irqL;
_queue *free_queue = &(pmlmepriv->free_bss_pool);
_func_enter_;
;
if (pnetwork == NULL)
goto exit;
@ -299,7 +299,7 @@ _func_enter_;
exit:
_func_exit_;
;
}
@ -308,7 +308,7 @@ void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *
_queue *free_queue = &(pmlmepriv->free_bss_pool);
_func_enter_;
;
if (pnetwork == NULL)
goto exit;
@ -328,7 +328,7 @@ _func_enter_;
exit:
_func_exit_;
;
}
@ -346,7 +346,7 @@ struct wlan_network *_rtw_find_network(_queue *scanned_queue, u8 *addr)
struct wlan_network *pnetwork = NULL;
u8 zero_addr[ETH_ALEN] = {0,0,0,0,0,0};
_func_enter_;
;
if(_rtw_memcmp(zero_addr, addr, ETH_ALEN)){
pnetwork=NULL;
@ -375,7 +375,7 @@ _func_enter_;
exit:
_func_exit_;
;
return pnetwork;
@ -390,7 +390,7 @@ void _rtw_free_network_queue(struct adapter *padapter, u8 isfreeall)
struct mlme_priv* pmlmepriv = &padapter->mlmepriv;
_queue *scanned_queue = &pmlmepriv->scanned_queue;
_func_enter_;
;
_enter_critical_bh(&scanned_queue->lock, &irqL);
@ -411,7 +411,7 @@ _func_enter_;
_exit_critical_bh(&scanned_queue->lock, &irqL);
_func_exit_;
;
}
@ -421,7 +421,7 @@ _func_exit_;
sint rtw_if_up(struct adapter *padapter) {
sint res;
_func_enter_;
;
if( padapter->bDriverStopped || padapter->bSurpriseRemoved ||
(check_fwstate(&padapter->mlmepriv, _FW_LINKED)== false)){
@ -431,7 +431,7 @@ _func_enter_;
else
res= true;
_func_exit_;
;
return res;
}
@ -440,14 +440,14 @@ void rtw_generate_random_ibss(u8* pibss)
{
u32 curtime = rtw_get_current_time();
_func_enter_;
;
pibss[0] = 0x02; //in ad-hoc mode bit1 must set to 1
pibss[1] = 0x11;
pibss[2] = 0x87;
pibss[3] = (u8)(curtime & 0xff) ;//p[0];
pibss[4] = (u8)((curtime>>8) & 0xff) ;//p[1];
pibss[5] = (u8)((curtime>>16) & 0xff) ;//p[2];
_func_exit_;
;
return;
}
@ -460,11 +460,11 @@ u8 *rtw_get_capability_from_ie(u8 *ie)
u16 rtw_get_capability(WLAN_BSSID_EX *bss)
{
u16 val;
_func_enter_;
;
_rtw_memcpy((u8 *)&val, rtw_get_capability_from_ie(bss->IEs), 2);
_func_exit_;
;
return le16_to_cpu(val);
}
@ -482,27 +482,27 @@ u8 *rtw_get_beacon_interval_from_ie(u8 *ie)
int rtw_init_mlme_priv (struct adapter *padapter)//(struct mlme_priv *pmlmepriv)
{
int res;
_func_enter_;
;
res = _rtw_init_mlme_priv(padapter);// (pmlmepriv);
_func_exit_;
;
return res;
}
void rtw_free_mlme_priv (struct mlme_priv *pmlmepriv)
{
_func_enter_;
;
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("rtw_free_mlme_priv\n"));
_rtw_free_mlme_priv (pmlmepriv);
_func_exit_;
;
}
int rtw_enqueue_network(_queue *queue, struct wlan_network *pnetwork);
int rtw_enqueue_network(_queue *queue, struct wlan_network *pnetwork)
{
int res;
_func_enter_;
;
res = _rtw_enqueue_network(queue, pnetwork);
_func_exit_;
;
return res;
}
@ -510,9 +510,9 @@ _func_exit_;
static struct wlan_network *rtw_dequeue_network(_queue *queue)
{
struct wlan_network *pnetwork;
_func_enter_;
;
pnetwork = _rtw_dequeue_network(queue);
_func_exit_;
;
return pnetwork;
}
@ -520,36 +520,36 @@ struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv );
struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv )//(_queue *free_queue)
{
struct wlan_network *pnetwork;
_func_enter_;
;
pnetwork = _rtw_alloc_network(pmlmepriv);
_func_exit_;
;
return pnetwork;
}
void rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork, u8 is_freeall);
void rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork, u8 is_freeall)//(struct wlan_network *pnetwork, _queue *free_queue)
{
_func_enter_;
;
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("rtw_free_network==> ssid = %s \n\n" , pnetwork->network.Ssid.Ssid));
_rtw_free_network(pmlmepriv, pnetwork, is_freeall);
_func_exit_;
;
}
void rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork );
void rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork )
{
_func_enter_;
;
//RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("rtw_free_network==> ssid = %s \n\n" , pnetwork->network.Ssid.Ssid));
_rtw_free_network_nolock(pmlmepriv, pnetwork);
_func_exit_;
;
}
void rtw_free_network_queue(struct adapter* dev, u8 isfreeall)
{
_func_enter_;
;
_rtw_free_network_queue(dev, isfreeall);
_func_exit_;
;
}
/*
@ -601,7 +601,7 @@ int is_same_network(WLAN_BSSID_EX *src, WLAN_BSSID_EX *dst, u8 feature)
{
u16 s_cap, d_cap;
_func_enter_;
;
#ifdef PLATFORM_OS_XP
if ( ((uint)dst) <= 0x7fffffff ||
@ -625,7 +625,7 @@ _func_enter_;
s_cap = le16_to_cpu(s_cap);
d_cap = le16_to_cpu(d_cap);
_func_exit_;
;
#ifdef CONFIG_P2P
if ((feature == 1) && // 1: P2P supported
@ -653,7 +653,7 @@ struct wlan_network * rtw_get_oldest_wlan_network(_queue *scanned_queue)
struct wlan_network *pwlan = NULL;
struct wlan_network *oldest = NULL;
_func_enter_;
;
phead = get_list_head(scanned_queue);
plist = get_next(phead);
@ -674,7 +674,7 @@ _func_enter_;
plist = get_next(plist);
}
_func_exit_;
;
return oldest;
}
@ -694,7 +694,7 @@ void update_network(WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src,
u8 sq_final;
long rssi_final;
_func_enter_;
;
#ifdef CONFIG_ANTENNA_DIVERSITY
rtw_hal_antdiv_rssi_compared(padapter, dst, src); //this will update src.Rssi, need consider again
@ -754,14 +754,14 @@ _func_enter_;
}
#endif
_func_exit_;
;
}
static void update_current_network(struct adapter *adapter, WLAN_BSSID_EX *pnetwork)
{
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
_func_enter_;
;
if ( (check_fwstate(pmlmepriv, _FW_LINKED)== true) && (is_same_network(&(pmlmepriv->cur_network.network), pnetwork, 0)))
{
@ -770,7 +770,7 @@ _func_enter_;
pmlmepriv->cur_network.network.IELength);
}
_func_exit_;
;
}
@ -795,7 +795,7 @@ void rtw_update_scanned_network(struct adapter *adapter, WLAN_BSSID_EX *target)
int target_find = 0;
u8 feature = 0;
_func_enter_;
;
_enter_critical_bh(&queue->lock, &irqL);
phead = get_list_head(queue);
@ -916,7 +916,7 @@ _func_enter_;
exit:
_exit_critical_bh(&queue->lock, &irqL);
_func_exit_;
;
}
void rtw_add_network(struct adapter *adapter, WLAN_BSSID_EX *pnetwork);
@ -926,7 +926,7 @@ void rtw_add_network(struct adapter *adapter, WLAN_BSSID_EX *pnetwork)
struct mlme_priv *pmlmepriv = &(((struct adapter *)adapter)->mlmepriv);
//_queue *queue = &(pmlmepriv->scanned_queue);
_func_enter_;
;
//_enter_critical_bh(&queue->lock, &irqL);
@ -940,7 +940,7 @@ _func_enter_;
//_exit_critical_bh(&queue->lock, &irqL);
_func_exit_;
;
}
//select the desired network based on the capability of the (i)bss.
@ -1014,9 +1014,9 @@ int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwor
void rtw_atimdone_event_callback(struct adapter *adapter , u8 *pbuf)
{
_func_enter_;
;
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("receive atimdone_evet\n"));
_func_exit_;
;
return;
}
@ -1028,7 +1028,7 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf)
WLAN_BSSID_EX *pnetwork;
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
_func_enter_;
;
pnetwork = (WLAN_BSSID_EX *)pbuf;
@ -1080,7 +1080,7 @@ exit:
_exit_critical_bh(&pmlmepriv->lock, &irqL);
_func_exit_;
;
return;
}
@ -1099,7 +1099,7 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)
#endif
_func_enter_;
;
_enter_critical_bh(&pmlmepriv->lock, &irqL);
if(pmlmepriv->wps_probe_req_ie)
@ -1259,7 +1259,7 @@ _func_enter_;
rtw_cfg80211_surveydone_event_callback(adapter);
#endif //CONFIG_IOCTL_CFG80211
_func_exit_;
;
}
@ -1280,7 +1280,7 @@ static void free_scanqueue(struct mlme_priv *pmlmepriv)
_queue *scan_queue = &pmlmepriv->scanned_queue;
_list *plist, *phead, *ptemp;
_func_enter_;
;
RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, ("+free_scanqueue\n"));
_enter_critical_bh(&scan_queue->lock, &irqL0);
@ -1301,7 +1301,7 @@ _func_enter_;
_exit_critical_bh(&free_queue->lock, &irqL);
_exit_critical_bh(&scan_queue->lock, &irqL0);
_func_exit_;
;
}
/*
@ -1318,7 +1318,7 @@ void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_queue)
#ifdef CONFIG_TDLS
struct tdls_info *ptdlsinfo = &adapter->tdlsinfo;
#endif //CONFIG_TDLS
_func_enter_;
;
RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, ("+rtw_free_assoc_resources\n"));
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("tgt_network->network.MacAddress="MAC_FMT" ssid=%s\n",
@ -1414,7 +1414,7 @@ _func_enter_;
adapter->securitypriv.key_mask = 0;
_func_exit_;
;
}
@ -1426,7 +1426,7 @@ void rtw_indicate_connect(struct adapter *padapter)
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
_func_enter_;
;
RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("+rtw_indicate_connect\n"));
@ -1471,7 +1471,7 @@ _func_enter_;
RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("-rtw_indicate_connect: fw_state=0x%08x\n", get_fwstate(pmlmepriv)));
_func_exit_;
;
}
@ -1488,7 +1488,7 @@ void rtw_indicate_disconnect( struct adapter *padapter )
struct sta_info *psta;
struct sta_priv *pstapriv = &padapter->stapriv;
_func_enter_;
;
RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("+rtw_indicate_disconnect\n"));
@ -1537,7 +1537,7 @@ _func_enter_;
rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_DISCONNECT, 1);
#endif
_func_exit_;
;
}
inline void rtw_indicate_scan_done( struct adapter *padapter, bool aborted)
@ -1778,7 +1778,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)
struct wlan_network *pcur_wlan = NULL, *ptarget_wlan = NULL;
unsigned int the_same_macaddr = false;
_func_enter_;
;
RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("joinbss event call back received with res=%d\n", pnetwork->join_res));
@ -1954,14 +1954,14 @@ _func_enter_;
ignore_joinbss_callback:
_exit_critical_bh(&pmlmepriv->lock, &irqL);
_func_exit_;
;
}
void rtw_joinbss_event_callback(struct adapter *adapter, u8 *pbuf)
{
struct wlan_network *pnetwork = (struct wlan_network *)pbuf;
_func_enter_;
;
mlmeext_joinbss_event_callback(adapter, pnetwork->join_res);
@ -1975,7 +1975,7 @@ _func_enter_;
dc_resume_xmit(adapter);
#endif
_func_exit_;
;
}
u8 search_max_mac_id(struct adapter *padapter)
@ -2046,7 +2046,7 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)
struct wlan_network *cur_network = &(pmlmepriv->cur_network);
struct wlan_network *ptarget_wlan = NULL;
_func_enter_;
;
if(rtw_access_ctrl(adapter, pstassoc->macaddr) == false)
return;
@ -2156,7 +2156,7 @@ _func_enter_;
mlmeext_sta_add_event_callback(adapter, psta);
exit:
_func_exit_;
;
}
@ -2173,7 +2173,7 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)
struct sta_priv *pstapriv = &adapter->stapriv;
struct wlan_network *tgt_network = &(pmlmepriv->cur_network);
_func_enter_;
;
psta = rtw_get_stainfo(&adapter->stapriv, pstadel->macaddr);
if(psta)
@ -2301,7 +2301,7 @@ _func_enter_;
_exit_critical_bh(&pmlmepriv->lock, &irqL2);
_func_exit_;
;
}
@ -2312,7 +2312,7 @@ void rtw_cpwm_event_callback(struct adapter *padapter, u8 *pbuf)
struct reportpwrstate_parm *preportpwrstate;
#endif
_func_enter_;
;
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("+rtw_cpwm_event_callback !!!\n"));
#ifdef CONFIG_LPS_LCLK
@ -2321,7 +2321,7 @@ _func_enter_;
cpwm_int_hdl(padapter, preportpwrstate);
#endif
_func_exit_;
;
}
@ -2337,7 +2337,7 @@ void _rtw_join_timeout_handler (struct adapter *adapter)
int do_join_r;
#endif //CONFIG_LAYER2_ROAMING
_func_enter_;
;
DBG_871X("%s, fw_state=%x\n", __FUNCTION__, get_fwstate(pmlmepriv));
if(adapter->bDriverStopped ||adapter->bSurpriseRemoved)
@ -2392,7 +2392,7 @@ _func_enter_;
drvext_assoc_fail_indicate(&adapter->drvextpriv);
#endif
_func_exit_;
;
}
@ -2714,7 +2714,7 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv )
struct wlan_network *candidate = NULL;
u8 bSupportAntDiv = false;
_func_enter_;
;
_enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
phead = get_list_head(queue);
@ -2778,7 +2778,7 @@ _func_enter_;
exit:
_exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
_func_exit_;
;
return ret;
}
@ -2790,7 +2790,7 @@ sint rtw_set_auth(struct adapter * adapter,struct security_priv *psecuritypriv)
struct cmd_priv *pcmdpriv=&(adapter->cmdpriv);
sint res=_SUCCESS;
_func_enter_;
;
pcmd = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
if(pcmd==NULL){
@ -2823,7 +2823,7 @@ _func_enter_;
exit:
_func_exit_;
;
return res;
@ -2839,7 +2839,7 @@ sint rtw_set_key(struct adapter * adapter,struct security_priv *psecuritypriv,si
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
sint res=_SUCCESS;
_func_enter_;
;
psetkeyparm=(struct setkey_parm*)rtw_zmalloc(sizeof(struct setkey_parm));
if(psetkeyparm==NULL){
@ -2918,7 +2918,7 @@ _func_enter_;
rtw_mfree((u8 *) psetkeyparm, sizeof(struct setkey_parm));
}
exit:
_func_exit_;
;
return res;
}
@ -3052,7 +3052,7 @@ sint rtw_restruct_sec_ie(struct adapter *adapter,u8 *in_ie, u8 *out_ie, uint in_
uint ndisauthmode=psecuritypriv->ndisauthtype;
uint ndissecuritytype = psecuritypriv->ndisencryptstatus;
_func_enter_;
;
RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_,
("+rtw_restruct_sec_ie: ndisauthmode=%d ndissecuritytype=%d\n",
@ -3105,7 +3105,7 @@ _func_enter_;
}
}
_func_exit_;
;
return ielength;
}
@ -3117,7 +3117,7 @@ void rtw_init_registrypriv_dev_network( struct adapter* adapter)
WLAN_BSSID_EX *pdev_network = &pregistrypriv->dev_network;
u8 *myhwaddr = myid(peepriv);
_func_enter_;
;
_rtw_memcpy(pdev_network->MacAddress, myhwaddr, ETH_ALEN);
@ -3131,7 +3131,7 @@ _func_enter_;
pdev_network->Configuration.FHConfig.DwellTime = 0;
_func_exit_;
;
}
@ -3144,7 +3144,7 @@ void rtw_update_registrypriv_dev_network(struct adapter* adapter)
struct wlan_network *cur_network = &adapter->mlmepriv.cur_network;
//struct xmit_priv *pxmitpriv = &adapter->xmitpriv;
_func_enter_;
;
pdev_network->Privacy = (psecuritypriv->dot11PrivacyAlgrthm > 0 ? 1 : 0) ; // adhoc no 802.1x
@ -3197,16 +3197,16 @@ _func_enter_;
//notes: translate IELength & Length after assign the Length to cmdsz in createbss_cmd();
//pdev_network->IELength = cpu_to_le32(sz);
_func_exit_;
;
}
void rtw_get_encrypt_decrypt_from_registrypriv(struct adapter* adapter)
{
_func_enter_;
;
_func_exit_;
;
}