skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-11-22 04:23:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Remove _func_enter_ and _func_exit_ statements

Browse source 
Kernel tracing is more effective.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2014-12-01 16:31:15 -06:00
parent 86fdc52e9a
commit e91077579f
29 changed files with 671 additions and 746 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

217
core/rtw_cmd.c
View file

@ -36,7 +36,7 @@ int _rtw_init_cmd_priv (struct cmd_priv *pcmdpriv)
{ {
int res = _SUCCESS; int res = _SUCCESS;
_func_enter_;
_rtw_init_sema(&(pcmdpriv->cmd_queue_sema), 0); _rtw_init_sema(&(pcmdpriv->cmd_queue_sema), 0);
/* _rtw_init_sema(&(pcmdpriv->cmd_done_sema), 0); */ /* _rtw_init_sema(&(pcmdpriv->cmd_done_sema), 0); */
@ -71,7 +71,7 @@ _func_enter_;
pcmdpriv->cmd_done_cnt = 0; pcmdpriv->cmd_done_cnt = 0;
pcmdpriv->rsp_cnt = 0; pcmdpriv->rsp_cnt = 0;
exit: exit:
_func_exit_;
return res; return res;
} }
@ -81,7 +81,7 @@ int _rtw_init_evt_priv(struct evt_priv *pevtpriv)
{ {
int res = _SUCCESS; int res = _SUCCESS;
_func_enter_;
/* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */ /* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */
ATOMIC_SET(&pevtpriv->event_seq, 0); ATOMIC_SET(&pevtpriv->event_seq, 0);
@ -91,14 +91,14 @@ _func_enter_;
pevtpriv->c2h_wk_alive = false; pevtpriv->c2h_wk_alive = false;
pevtpriv->c2h_queue = rtw_cbuf_alloc(C2H_QUEUE_MAX_LEN+1); pevtpriv->c2h_queue = rtw_cbuf_alloc(C2H_QUEUE_MAX_LEN+1);
_func_exit_;
return res; return res;
} }
void rtw_free_evt_priv(struct evt_priv *pevtpriv) void rtw_free_evt_priv(struct evt_priv *pevtpriv)
{ {
_func_enter_;
RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("+rtw_free_evt_priv\n")); RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("+rtw_free_evt_priv\n"));
@ -113,12 +113,12 @@ _func_enter_;
} }
RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("-rtw_free_evt_priv\n")); RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("-rtw_free_evt_priv\n"));
_func_exit_;
} }
void _rtw_free_cmd_priv (struct cmd_priv *pcmdpriv) void _rtw_free_cmd_priv (struct cmd_priv *pcmdpriv)
{ {
_func_enter_;
if (pcmdpriv) { if (pcmdpriv) {
_rtw_spinlock_free(&(pcmdpriv->cmd_queue.lock)); _rtw_spinlock_free(&(pcmdpriv->cmd_queue.lock));
@ -131,7 +131,7 @@ _func_enter_;
if (pcmdpriv->rsp_allocated_buf) if (pcmdpriv->rsp_allocated_buf)
kfree(pcmdpriv->rsp_allocated_buf); kfree(pcmdpriv->rsp_allocated_buf);
} }
_func_exit_;
} }
/* /*
@ -147,7 +147,7 @@ ISR/Call-Back functions can't call this sub-function.
int _rtw_enqueue_cmd(struct __queue *queue, struct cmd_obj *obj) int _rtw_enqueue_cmd(struct __queue *queue, struct cmd_obj *obj)
{ {
unsigned long flags; unsigned long flags;
_func_enter_;
if (obj == NULL) if (obj == NULL)
goto exit; goto exit;
@ -160,7 +160,7 @@ _func_enter_;
exit: exit:
_func_exit_;
return _SUCCESS; return _SUCCESS;
} }
@ -170,7 +170,7 @@ struct cmd_obj *_rtw_dequeue_cmd(struct __queue *queue)
struct cmd_obj *obj; struct cmd_obj *obj;
unsigned long flags; unsigned long flags;
_func_enter_;
spin_lock_irqsave(&queue->lock, flags); spin_lock_irqsave(&queue->lock, flags);
if (rtw_is_list_empty(&(queue->queue))) { if (rtw_is_list_empty(&(queue->queue))) {
@ -182,7 +182,7 @@ _func_enter_;
spin_unlock_irqrestore(&queue->lock, flags); spin_unlock_irqrestore(&queue->lock, flags);
_func_exit_;
return obj; return obj;
} }
@ -190,27 +190,27 @@ _func_exit_;
u32 rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) u32 rtw_init_cmd_priv(struct cmd_priv *pcmdpriv)
{ {
u32 res; u32 res;
_func_enter_;
res = _rtw_init_cmd_priv (pcmdpriv); res = _rtw_init_cmd_priv (pcmdpriv);
_func_exit_;
return res; return res;
} }
u32 rtw_init_evt_priv (struct evt_priv *pevtpriv) u32 rtw_init_evt_priv (struct evt_priv *pevtpriv)
{ {
int res; int res;
_func_enter_;
res = _rtw_init_evt_priv(pevtpriv); res = _rtw_init_evt_priv(pevtpriv);
_func_exit_;
return res; return res;
} }
void rtw_free_cmd_priv(struct cmd_priv *pcmdpriv) void rtw_free_cmd_priv(struct cmd_priv *pcmdpriv)
{ {
_func_enter_;
RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("rtw_free_cmd_priv\n")); RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("rtw_free_cmd_priv\n"));
_rtw_free_cmd_priv(pcmdpriv); _rtw_free_cmd_priv(pcmdpriv);
_func_exit_;
} }
static int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj) static int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)
@ -241,7 +241,7 @@ u32 rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)
int res = _FAIL; int res = _FAIL;
struct adapter *padapter = pcmdpriv->padapter; struct adapter *padapter = pcmdpriv->padapter;
_func_enter_;
if (cmd_obj == NULL) if (cmd_obj == NULL)
goto exit; goto exit;
@ -261,7 +261,7 @@ _func_enter_;
exit: exit:
_func_exit_;
return res; return res;
} }
@ -270,25 +270,25 @@ struct cmd_obj *rtw_dequeue_cmd(struct cmd_priv *pcmdpriv)
{ {
struct cmd_obj *cmd_obj; struct cmd_obj *cmd_obj;
_func_enter_;
cmd_obj = _rtw_dequeue_cmd(&pcmdpriv->cmd_queue); cmd_obj = _rtw_dequeue_cmd(&pcmdpriv->cmd_queue);
_func_exit_;
return cmd_obj; return cmd_obj;
} }
void rtw_cmd_clr_isr(struct cmd_priv *pcmdpriv) void rtw_cmd_clr_isr(struct cmd_priv *pcmdpriv)
{ {
_func_enter_;
pcmdpriv->cmd_done_cnt++; pcmdpriv->cmd_done_cnt++;
/* _rtw_up_sema(&(pcmdpriv->cmd_done_sema)); */ /* _rtw_up_sema(&(pcmdpriv->cmd_done_sema)); */
_func_exit_;
} }
void rtw_free_cmd_obj(struct cmd_obj *pcmd) void rtw_free_cmd_obj(struct cmd_obj *pcmd)
{ {
_func_enter_;
if ((pcmd->cmdcode != _JoinBss_CMD_) && (pcmd->cmdcode != _CreateBss_CMD_)) { if ((pcmd->cmdcode != _JoinBss_CMD_) && (pcmd->cmdcode != _CreateBss_CMD_)) {
/* free parmbuf in cmd_obj */ /* free parmbuf in cmd_obj */
@ -305,7 +305,7 @@ _func_enter_;
/* free cmd_obj */ /* free cmd_obj */
kfree(pcmd); kfree(pcmd);
_func_exit_;
} }
int rtw_cmd_thread(void *context) int rtw_cmd_thread(void *context)
@ -318,7 +318,7 @@ int rtw_cmd_thread(void *context)
struct adapter *padapter = (struct adapter *)context; struct adapter *padapter = (struct adapter *)context;
struct cmd_priv *pcmdpriv = &(padapter->cmdpriv); struct cmd_priv *pcmdpriv = &(padapter->cmdpriv);
_func_enter_;
thread_enter("RTW_CMD_THREAD"); thread_enter("RTW_CMD_THREAD");
@ -413,7 +413,7 @@ post_process:
_rtw_up_sema(&pcmdpriv->terminate_cmdthread_sema); _rtw_up_sema(&pcmdpriv->terminate_cmdthread_sema);
_func_exit_;
thread_exit(); thread_exit();
} }
@ -426,7 +426,7 @@ u8 rtw_setstandby_cmd(struct adapter *padapter, uint action)
u8 ret = _SUCCESS; u8 ret = _SUCCESS;
_func_enter_;
ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (ph2c == NULL) { if (ph2c == NULL) {
@ -449,7 +449,7 @@ _func_enter_;
exit: exit:
_func_exit_;
return ret; return ret;
} }
@ -468,7 +468,7 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, struct ndis_802_11_ssid *ssid,
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_func_enter_;
if (check_fwstate(pmlmepriv, _FW_LINKED) == true) { if (check_fwstate(pmlmepriv, _FW_LINKED) == true) {
rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_SCAN, 1); rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_SCAN, 1);
} }
@ -540,7 +540,7 @@ _func_enter_;
_clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY); _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY);
} }
_func_exit_;
return res; return res;
} }
@ -552,7 +552,7 @@ u8 rtw_setdatarate_cmd(struct adapter *padapter, u8 *rateset)
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
u8 res = _SUCCESS; u8 res = _SUCCESS;
_func_enter_;
ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (ph2c == NULL) { if (ph2c == NULL) {
@ -573,7 +573,7 @@ _func_enter_;
res = rtw_enqueue_cmd(pcmdpriv, ph2c); res = rtw_enqueue_cmd(pcmdpriv, ph2c);
exit: exit:
_func_exit_;
return res; return res;
} }
@ -585,7 +585,7 @@ u8 rtw_setbasicrate_cmd(struct adapter *padapter, u8 *rateset)
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
u8 res = _SUCCESS; u8 res = _SUCCESS;
_func_enter_;
ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (ph2c == NULL) { if (ph2c == NULL) {
@ -607,7 +607,7 @@ _func_enter_;
res = rtw_enqueue_cmd(pcmdpriv, ph2c); res = rtw_enqueue_cmd(pcmdpriv, ph2c);
exit: exit:
_func_exit_;
return res; return res;
} }
@ -627,7 +627,7 @@ u8 rtw_setphy_cmd(struct adapter *padapter, u8 modem, u8 ch)
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
u8 res = _SUCCESS; u8 res = _SUCCESS;
_func_enter_;
ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (ph2c == NULL) { if (ph2c == NULL) {
@ -651,7 +651,7 @@ _func_enter_;
res = rtw_enqueue_cmd(pcmdpriv, ph2c); res = rtw_enqueue_cmd(pcmdpriv, ph2c);
exit: exit:
_func_exit_;
return res; return res;
} }
@ -662,7 +662,7 @@ u8 rtw_setbbreg_cmd(struct adapter *padapter, u8 offset, u8 val)
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
u8 res = _SUCCESS; u8 res = _SUCCESS;
_func_enter_;
ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (ph2c == NULL) { if (ph2c == NULL) {
res = _FAIL; res = _FAIL;
@ -683,7 +683,7 @@ _func_enter_;
res = rtw_enqueue_cmd(pcmdpriv, ph2c); res = rtw_enqueue_cmd(pcmdpriv, ph2c);
exit: exit:
_func_exit_;
return res; return res;
} }
@ -694,7 +694,7 @@ u8 rtw_getbbreg_cmd(struct adapter *padapter, u8 offset, u8 *pval)
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
u8 res = _SUCCESS; u8 res = _SUCCESS;
_func_enter_;
ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (ph2c == NULL) { if (ph2c == NULL) {
res = _FAIL; res = _FAIL;
@ -718,7 +718,7 @@ _func_enter_;
res = rtw_enqueue_cmd(pcmdpriv, ph2c); res = rtw_enqueue_cmd(pcmdpriv, ph2c);
exit: exit:
_func_exit_;
return res; return res;
} }
@ -728,7 +728,7 @@ u8 rtw_setrfreg_cmd(struct adapter *padapter, u8 offset, u32 val)
struct writeRF_parm *pwriterfparm; struct writeRF_parm *pwriterfparm;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
u8 res = _SUCCESS; u8 res = _SUCCESS;
_func_enter_;
ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (ph2c == NULL) { if (ph2c == NULL) {
res = _FAIL; res = _FAIL;
@ -749,7 +749,7 @@ _func_enter_;
res = rtw_enqueue_cmd(pcmdpriv, ph2c); res = rtw_enqueue_cmd(pcmdpriv, ph2c);
exit: exit:
_func_exit_;
return res; return res;
} }
@ -760,7 +760,7 @@ u8 rtw_getrfreg_cmd(struct adapter *padapter, u8 offset, u8 *pval)
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
u8 res = _SUCCESS; u8 res = _SUCCESS;
_func_enter_;
ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (ph2c == NULL) { if (ph2c == NULL) {
@ -788,33 +788,33 @@ _func_enter_;
exit: exit:
_func_exit_;
return res; return res;
} }
void rtw_getbbrfreg_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pcmd) void rtw_getbbrfreg_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pcmd)
{ {
_func_enter_;
kfree(pcmd->parmbuf); kfree(pcmd->parmbuf);
kfree(pcmd); kfree(pcmd);
if (padapter->registrypriv.mp_mode == 1) if (padapter->registrypriv.mp_mode == 1)
padapter->mppriv.workparam.bcompleted = true; padapter->mppriv.workparam.bcompleted = true;
_func_exit_;
} }
void rtw_readtssi_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pcmd) void rtw_readtssi_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pcmd)
{ {
_func_enter_;
kfree(pcmd->parmbuf); kfree(pcmd->parmbuf);
kfree(pcmd); kfree(pcmd);
if (padapter->registrypriv.mp_mode == 1) if (padapter->registrypriv.mp_mode == 1)
padapter->mppriv.workparam.bcompleted = true; padapter->mppriv.workparam.bcompleted = true;
_func_exit_;
} }
u8 rtw_createbss_cmd(struct adapter *padapter) u8 rtw_createbss_cmd(struct adapter *padapter)
@ -825,7 +825,7 @@ u8 rtw_createbss_cmd(struct adapter *padapter)
struct wlan_bssid_ex *pdev_network = &padapter->registrypriv.dev_network; struct wlan_bssid_ex *pdev_network = &padapter->registrypriv.dev_network;
u8 res = _SUCCESS; u8 res = _SUCCESS;
_func_enter_;
rtw_led_control(padapter, LED_CTL_START_TO_LINK); rtw_led_control(padapter, LED_CTL_START_TO_LINK);
@ -850,7 +850,7 @@ _func_enter_;
res = rtw_enqueue_cmd(pcmdpriv, pcmd); res = rtw_enqueue_cmd(pcmdpriv, pcmd);
exit: exit:
_func_exit_;
return res; return res;
} }
@ -861,7 +861,7 @@ u8 rtw_createbss_cmd_ex(struct adapter *padapter, unsigned char *pbss, unsigned
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
u8 res = _SUCCESS; u8 res = _SUCCESS;
_func_enter_;
pcmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); pcmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (pcmd == NULL) { if (pcmd == NULL) {
@ -880,7 +880,7 @@ _func_enter_;
exit: exit:
_func_exit_;
return res; return res;
} }
@ -901,7 +901,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork)
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
_func_enter_;
rtw_led_control(padapter, LED_CTL_START_TO_LINK); rtw_led_control(padapter, LED_CTL_START_TO_LINK);
@ -1023,7 +1023,7 @@ _func_enter_;
exit: exit:
_func_exit_;
return res; return res;
} }
@ -1035,7 +1035,7 @@ u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool enqueu
struct cmd_priv *cmdpriv = &padapter->cmdpriv; struct cmd_priv *cmdpriv = &padapter->cmdpriv;
u8 res = _SUCCESS; u8 res = _SUCCESS;
_func_enter_;
RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_disassoc_cmd\n")); RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_disassoc_cmd\n"));
@ -1066,7 +1066,7 @@ _func_enter_;
exit: exit:
_func_exit_;
return res; return res;
} }
@ -1079,7 +1079,7 @@ u8 rtw_setopmode_cmd(struct adapter *padapter, enum ndis_802_11_network_infra n
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
u8 res = _SUCCESS; u8 res = _SUCCESS;
_func_enter_;
ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (ph2c == NULL) { if (ph2c == NULL) {
@ -1101,7 +1101,7 @@ _func_enter_;
exit: exit:
_func_exit_;
return res; return res;
} }
@ -1118,7 +1118,7 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, u8 *psta, u8 unicast_key)
struct sta_info *sta = (struct sta_info *)psta; struct sta_info *sta = (struct sta_info *)psta;
u8 res = _SUCCESS; u8 res = _SUCCESS;
_func_enter_;
ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (ph2c == NULL) { if (ph2c == NULL) {
@ -1164,7 +1164,7 @@ _func_enter_;
exit: exit:
_func_exit_;
return res; return res;
} }
@ -1178,7 +1178,7 @@ u8 rtw_clearstakey_cmd(struct adapter *padapter, u8 *psta, u8 entry, u8 enqueue)
struct sta_info *sta = (struct sta_info *)psta; struct sta_info *sta = (struct sta_info *)psta;
u8 res = _SUCCESS; u8 res = _SUCCESS;
_func_enter_;
if (!enqueue) { if (!enqueue) {
clear_cam_entry(padapter, entry); clear_cam_entry(padapter, entry);
@ -1218,7 +1218,7 @@ _func_enter_;
} }
exit: exit:
_func_exit_;
return res; return res;
} }
@ -1229,7 +1229,7 @@ u8 rtw_setrttbl_cmd(struct adapter *padapter, struct setratable_parm *prate_tab
struct setratable_parm *psetrttblparm; struct setratable_parm *psetrttblparm;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
u8 res = _SUCCESS; u8 res = _SUCCESS;
_func_enter_;
ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (ph2c == NULL) { if (ph2c == NULL) {
@ -1250,7 +1250,7 @@ _func_enter_;
res = rtw_enqueue_cmd(pcmdpriv, ph2c); res = rtw_enqueue_cmd(pcmdpriv, ph2c);
exit: exit:
_func_exit_;
return res; return res;
} }
@ -1260,7 +1260,7 @@ u8 rtw_getrttbl_cmd(struct adapter *padapter, struct getratable_rsp *pval)
struct getratable_parm *pgetrttblparm; struct getratable_parm *pgetrttblparm;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
u8 res = _SUCCESS; u8 res = _SUCCESS;
_func_enter_;
ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (ph2c == NULL) { if (ph2c == NULL) {
@ -1288,7 +1288,7 @@ _func_enter_;
res = rtw_enqueue_cmd(pcmdpriv, ph2c); res = rtw_enqueue_cmd(pcmdpriv, ph2c);
exit: exit:
_func_exit_;
return res; return res;
} }
@ -1301,7 +1301,7 @@ u8 rtw_setassocsta_cmd(struct adapter *padapter, u8 *mac_addr)
u8 res = _SUCCESS; u8 res = _SUCCESS;
_func_enter_;
ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (ph2c == NULL) { if (ph2c == NULL) {
@ -1333,7 +1333,7 @@ _func_enter_;
exit: exit:
_func_exit_;
return res; return res;
} }
@ -1345,7 +1345,7 @@ u8 rtw_addbareq_cmd(struct adapter *padapter, u8 tid, u8 *addr)
struct addBaReq_parm *paddbareq_parm; struct addBaReq_parm *paddbareq_parm;
u8 res = _SUCCESS; u8 res = _SUCCESS;
_func_enter_;
ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (ph2c == NULL) { if (ph2c == NULL) {
@ -1372,7 +1372,7 @@ _func_enter_;
exit: exit:
_func_exit_;
return res; return res;
} }
@ -1384,7 +1384,7 @@ u8 rtw_dynamic_chk_wk_cmd(struct adapter *padapter)
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
u8 res = _SUCCESS; u8 res = _SUCCESS;
_func_enter_;
ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (ph2c == NULL) { if (ph2c == NULL) {
@ -1409,7 +1409,7 @@ _func_enter_;
/* rtw_enqueue_cmd(pcmdpriv, ph2c); */ /* rtw_enqueue_cmd(pcmdpriv, ph2c); */
res = rtw_enqueue_cmd(pcmdpriv, ph2c); res = rtw_enqueue_cmd(pcmdpriv, ph2c);
exit: exit:
_func_exit_;
return res; return res;
} }
@ -1421,7 +1421,7 @@ u8 rtw_set_ch_cmd(struct adapter *padapter, u8 ch, u8 bw, u8 ch_offset, u8 enque
u8 res = _SUCCESS; u8 res = _SUCCESS;
_func_enter_;
DBG_88E(FUNC_NDEV_FMT" ch:%u, bw:%u, ch_offset:%u\n", DBG_88E(FUNC_NDEV_FMT" ch:%u, bw:%u, ch_offset:%u\n",
FUNC_NDEV_ARG(padapter->pnetdev), ch, bw, ch_offset); FUNC_NDEV_ARG(padapter->pnetdev), ch, bw, ch_offset);
@ -1463,7 +1463,7 @@ exit:
DBG_88E(FUNC_NDEV_FMT" res:%u\n", FUNC_NDEV_ARG(padapter->pnetdev), res); DBG_88E(FUNC_NDEV_FMT" res:%u\n", FUNC_NDEV_ARG(padapter->pnetdev), res);
_func_exit_;
return res; return res;
} }
@ -1476,7 +1476,7 @@ u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 chplan, u8 enqueue)
u8 res = _SUCCESS; u8 res = _SUCCESS;
_func_enter_;
RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_set_chplan_cmd\n")); RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_set_chplan_cmd\n"));
@ -1519,7 +1519,7 @@ _func_enter_;
exit: exit:
_func_exit_;
return res; return res;
} }
@ -1532,7 +1532,7 @@ u8 rtw_led_blink_cmd(struct adapter *padapter, struct LED_871x *pLed)
u8 res = _SUCCESS; u8 res = _SUCCESS;
_func_enter_;
RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_led_blink_cmd\n")); RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_led_blink_cmd\n"));
@ -1556,7 +1556,7 @@ _func_enter_;
exit: exit:
_func_exit_;
return res; return res;
} }
@ -1569,7 +1569,7 @@ u8 rtw_set_csa_cmd(struct adapter *padapter, u8 new_ch_no)
u8 res = _SUCCESS; u8 res = _SUCCESS;
_func_enter_;
RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_set_csa_cmd\n")); RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_set_csa_cmd\n"));
@ -1593,7 +1593,7 @@ _func_enter_;
exit: exit:
_func_exit_;
return res; return res;
} }
@ -1688,7 +1688,7 @@ static void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type)
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
u8 mstatus; u8 mstatus;
_func_enter_;
if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true) || if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true) ||
(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true)) (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true))
@ -1727,7 +1727,7 @@ _func_enter_;
break; break;
} }
_func_exit_;
} }
u8 rtw_lps_ctrl_wk_cmd(struct adapter *padapter, u8 lps_ctrl_type, u8 enqueue) u8 rtw_lps_ctrl_wk_cmd(struct adapter *padapter, u8 lps_ctrl_type, u8 enqueue)
@ -1738,7 +1738,7 @@ u8 rtw_lps_ctrl_wk_cmd(struct adapter *padapter, u8 lps_ctrl_type, u8 enqueue)
/* struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv; */ /* struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv; */
u8 res = _SUCCESS; u8 res = _SUCCESS;
_func_enter_;
/* if (!pwrctrlpriv->bLeisurePs) */ /* if (!pwrctrlpriv->bLeisurePs) */
/* return res; */ /* return res; */
@ -1770,7 +1770,7 @@ _func_enter_;
exit: exit:
_func_exit_;
return res; return res;
} }
@ -1788,7 +1788,7 @@ u8 rtw_rpt_timer_cfg_cmd(struct adapter *padapter, u16 min_time)
u8 res = _SUCCESS; u8 res = _SUCCESS;
_func_enter_;
ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (ph2c == NULL) { if (ph2c == NULL) {
res = _FAIL; res = _FAIL;
@ -1809,7 +1809,7 @@ _func_enter_;
res = rtw_enqueue_cmd(pcmdpriv, ph2c); res = rtw_enqueue_cmd(pcmdpriv, ph2c);
exit: exit:
_func_exit_;
return res; return res;
} }
@ -1827,7 +1827,7 @@ u8 rtw_antenna_select_cmd(struct adapter *padapter, u8 antenna, u8 enqueue)
u8 support_ant_div; u8 support_ant_div;
u8 res = _SUCCESS; u8 res = _SUCCESS;
_func_enter_;
rtw_hal_get_def_var(padapter, HAL_DEF_IS_SUPPORT_ANT_DIV, &support_ant_div); rtw_hal_get_def_var(padapter, HAL_DEF_IS_SUPPORT_ANT_DIV, &support_ant_div);
if (!support_ant_div) if (!support_ant_div)
return res; return res;
@ -1857,7 +1857,7 @@ _func_enter_;
} }
exit: exit:
_func_exit_;
return res; return res;
} }
@ -1876,7 +1876,7 @@ u8 p2p_protocol_wk_cmd(struct adapter *padapter, int intCmdType)
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
u8 res = _SUCCESS; u8 res = _SUCCESS;
_func_enter_;
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
return res; return res;
@ -1904,7 +1904,7 @@ _func_enter_;
exit: exit:
_func_exit_;
return res; return res;
} }
@ -1917,7 +1917,7 @@ u8 rtw_ps_cmd(struct adapter *padapter)
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
u8 res = _SUCCESS; u8 res = _SUCCESS;
_func_enter_;
ppscmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); ppscmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (ppscmd == NULL) { if (ppscmd == NULL) {
@ -1940,7 +1940,7 @@ _func_enter_;
exit: exit:
_func_exit_;
return res; return res;
} }
@ -2177,7 +2177,7 @@ void rtw_survey_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)
{ {
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_func_enter_;
if (pcmd->res == H2C_DROPPED) { if (pcmd->res == H2C_DROPPED) {
/* TODO: cancel timer and do timeout handler directly... */ /* TODO: cancel timer and do timeout handler directly... */
@ -2191,38 +2191,31 @@ _func_enter_;
/* free cmd */ /* free cmd */
rtw_free_cmd_obj(pcmd); rtw_free_cmd_obj(pcmd);
_func_exit_;
} }
void rtw_disassoc_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd) void rtw_disassoc_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)
{ {
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_func_enter_;
if (pcmd->res != H2C_SUCCESS) { if (pcmd->res != H2C_SUCCESS) {
spin_lock_bh(&pmlmepriv->lock); spin_lock_bh(&pmlmepriv->lock);
set_fwstate(pmlmepriv, _FW_LINKED); set_fwstate(pmlmepriv, _FW_LINKED);
spin_unlock_bh(&pmlmepriv->lock); spin_unlock_bh(&pmlmepriv->lock);
RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\n ***Error: disconnect_cmd_callback Fail ***\n.")); RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\n ***Error: disconnect_cmd_callback Fail ***\n."));
return;
goto exit;
} else /* clear bridge database */ } else /* clear bridge database */
nat25_db_cleanup(padapter); nat25_db_cleanup(padapter);
/* free cmd */ /* free cmd */
rtw_free_cmd_obj(pcmd); rtw_free_cmd_obj(pcmd);
exit:
_func_exit_;
} }
void rtw_joinbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd) void rtw_joinbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)
{ {
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_func_enter_;
if (pcmd->res == H2C_DROPPED) { if (pcmd->res == H2C_DROPPED) {
/* TODO: cancel timer and do timeout handler directly... */ /* TODO: cancel timer and do timeout handler directly... */
@ -2234,8 +2227,6 @@ _func_enter_;
} }
rtw_free_cmd_obj(pcmd); rtw_free_cmd_obj(pcmd);
_func_exit_;
} }
void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd) void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)
@ -2247,7 +2238,7 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)
struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)pcmd->parmbuf; struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)pcmd->parmbuf;
struct wlan_network *tgt_network = &(pmlmepriv->cur_network); struct wlan_network *tgt_network = &(pmlmepriv->cur_network);
_func_enter_;
if ((pcmd->res != H2C_SUCCESS)) { if ((pcmd->res != H2C_SUCCESS)) {
RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\n ********Error: rtw_createbss_cmd_callback Fail ************\n\n.")); RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\n ********Error: rtw_createbss_cmd_callback Fail ************\n\n."));
@ -2302,7 +2293,7 @@ createbss_cmd_fail:
rtw_free_cmd_obj(pcmd); rtw_free_cmd_obj(pcmd);
_func_exit_;
} }
void rtw_setstaKey_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pcmd) void rtw_setstaKey_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pcmd)
@ -2311,7 +2302,7 @@ void rtw_setstaKey_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pc
struct set_stakey_rsp *psetstakey_rsp = (struct set_stakey_rsp *)(pcmd->rsp); struct set_stakey_rsp *psetstakey_rsp = (struct set_stakey_rsp *)(pcmd->rsp);
struct sta_info *psta = rtw_get_stainfo(pstapriv, psetstakey_rsp->addr); struct sta_info *psta = rtw_get_stainfo(pstapriv, psetstakey_rsp->addr);
_func_enter_;
if (psta == NULL) { if (psta == NULL) {
RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\nERROR: rtw_setstaKey_cmdrsp_callback => can't get sta_info\n\n")); RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\nERROR: rtw_setstaKey_cmdrsp_callback => can't get sta_info\n\n"));
@ -2319,7 +2310,7 @@ _func_enter_;
} }
exit: exit:
rtw_free_cmd_obj(pcmd); rtw_free_cmd_obj(pcmd);
_func_exit_;
} }
void rtw_setassocsta_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pcmd) void rtw_setassocsta_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pcmd)
@ -2330,7 +2321,7 @@ void rtw_setassocsta_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *
struct set_assocsta_rsp *passocsta_rsp = (struct set_assocsta_rsp *)(pcmd->rsp); struct set_assocsta_rsp *passocsta_rsp = (struct set_assocsta_rsp *)(pcmd->rsp);
struct sta_info *psta = rtw_get_stainfo(pstapriv, passocsta_parm->addr); struct sta_info *psta = rtw_get_stainfo(pstapriv, passocsta_parm->addr);
_func_enter_;
if (psta == NULL) { if (psta == NULL) {
RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\nERROR: setassocsta_cmdrsp_callbac => can't get sta_info\n\n")); RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\nERROR: setassocsta_cmdrsp_callbac => can't get sta_info\n\n"));
@ -2351,5 +2342,5 @@ _func_enter_;
exit: exit:
rtw_free_cmd_obj(pcmd); rtw_free_cmd_obj(pcmd);
_func_exit_;
} }

26
core/rtw_ieee80211.c
View file

@ -147,7 +147,7 @@ u8 *rtw_set_ie
uint *frlen /* frame length */ uint *frlen /* frame length */
) )
{ {
_func_enter_;
*pbuf = (u8)index; *pbuf = (u8)index;
*(pbuf + 1) = (u8)len; *(pbuf + 1) = (u8)len;
@ -157,7 +157,7 @@ _func_enter_;
*frlen = *frlen + (len + 2); *frlen = *frlen + (len + 2);
_func_exit_;
return pbuf + len + 2; return pbuf + len + 2;
} }
@ -221,9 +221,9 @@ u8 *rtw_get_ie(u8 *pbuf, int index, int *len, int limit)
{ {
int tmp, i; int tmp, i;
u8 *p; u8 *p;
_func_enter_;
if (limit < 1) { if (limit < 1) {
_func_exit_;
return NULL; return NULL;
} }
@ -242,7 +242,7 @@ _func_enter_;
if (i >= limit) if (i >= limit)
break; break;
} }
_func_exit_;
return NULL; return NULL;
} }
@ -339,7 +339,7 @@ exit:
void rtw_set_supported_rate(u8 *SupportedRates, uint mode) void rtw_set_supported_rate(u8 *SupportedRates, uint mode)
{ {
_func_enter_;
_rtw_memset(SupportedRates, 0, NDIS_802_11_LENGTH_RATES_EX); _rtw_memset(SupportedRates, 0, NDIS_802_11_LENGTH_RATES_EX);
@ -361,13 +361,13 @@ _func_enter_;
memcpy(SupportedRates + IEEE80211_CCK_RATE_LEN, WIFI_OFDMRATES, IEEE80211_NUM_OFDM_RATESLEN); memcpy(SupportedRates + IEEE80211_CCK_RATE_LEN, WIFI_OFDMRATES, IEEE80211_NUM_OFDM_RATESLEN);
break; break;
} }
_func_exit_;
} }
uint rtw_get_rateset_len(u8 *rateset) uint rtw_get_rateset_len(u8 *rateset)
{ {
uint i = 0; uint i = 0;
_func_enter_;
while (1) { while (1) {
if ((rateset[i]) == 0) if ((rateset[i]) == 0)
break; break;
@ -375,7 +375,7 @@ _func_enter_;
break; break;
i++; i++;
} }
_func_exit_;
return i; return i;
} }
@ -386,7 +386,7 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv)
struct wlan_bssid_ex *pdev_network = &pregistrypriv->dev_network; struct wlan_bssid_ex *pdev_network = &pregistrypriv->dev_network;
u8 *ie = pdev_network->IEs; u8 *ie = pdev_network->IEs;
_func_enter_;
/* timestamp will be inserted by hardware */ /* timestamp will be inserted by hardware */
sz += 8; sz += 8;
@ -444,7 +444,7 @@ _func_enter_;
if (rateLen > 8) if (rateLen > 8)
ie = rtw_set_ie(ie, _EXT_SUPPORTEDRATES_IE_, (rateLen - 8), (pdev_network->SupportedRates + 8), &sz); ie = rtw_set_ie(ie, _EXT_SUPPORTEDRATES_IE_, (rateLen - 8), (pdev_network->SupportedRates + 8), &sz);
_func_exit_;
return sz; return sz;
} }
@ -672,7 +672,7 @@ int rtw_get_sec_ie(u8 *in_ie, uint in_len, u8 *rsn_ie, u16 *rsn_len, u8 *wpa_ie,
u8 wpa_oui[4] = {0x0, 0x50, 0xf2, 0x01}; u8 wpa_oui[4] = {0x0, 0x50, 0xf2, 0x01};
uint cnt; uint cnt;
_func_enter_;
/* Search required WPA or WPA2 IE and copy to sec_ie[] */ /* Search required WPA or WPA2 IE and copy to sec_ie[] */
@ -726,7 +726,7 @@ _func_enter_;
} }
} }
_func_exit_;
return *rsn_len + *wpa_len; return *rsn_len + *wpa_len;
} }

56
core/rtw_io.c
View file

@ -59,10 +59,10 @@ u8 _rtw_read8(struct adapter *adapter, u32 addr)
struct intf_hdl *pintfhdl = &(pio_priv->intf); struct intf_hdl *pintfhdl = &(pio_priv->intf);
u8 (*_read8)(struct intf_hdl *pintfhdl, u32 addr); u8 (*_read8)(struct intf_hdl *pintfhdl, u32 addr);
_func_enter_;
_read8 = pintfhdl->io_ops._read8; _read8 = pintfhdl->io_ops._read8;
r_val = _read8(pintfhdl, addr); r_val = _read8(pintfhdl, addr);
_func_exit_;
return r_val; return r_val;
} }
@ -72,11 +72,11 @@ u16 _rtw_read16(struct adapter *adapter, u32 addr)
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
struct intf_hdl *pintfhdl = &(pio_priv->intf); struct intf_hdl *pintfhdl = &(pio_priv->intf);
u16 (*_read16)(struct intf_hdl *pintfhdl, u32 addr); u16 (*_read16)(struct intf_hdl *pintfhdl, u32 addr);
_func_enter_;
_read16 = pintfhdl->io_ops._read16; _read16 = pintfhdl->io_ops._read16;
r_val = _read16(pintfhdl, addr); r_val = _read16(pintfhdl, addr);
_func_exit_;
return r_val; return r_val;
} }
@ -86,11 +86,11 @@ u32 _rtw_read32(struct adapter *adapter, u32 addr)
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
struct intf_hdl *pintfhdl = &(pio_priv->intf); struct intf_hdl *pintfhdl = &(pio_priv->intf);
u32 (*_read32)(struct intf_hdl *pintfhdl, u32 addr); u32 (*_read32)(struct intf_hdl *pintfhdl, u32 addr);
_func_enter_;
_read32 = pintfhdl->io_ops._read32; _read32 = pintfhdl->io_ops._read32;
r_val = _read32(pintfhdl, addr); r_val = _read32(pintfhdl, addr);
_func_exit_;
return r_val; return r_val;
} }
@ -100,11 +100,11 @@ int _rtw_write8(struct adapter *adapter, u32 addr, u8 val)
struct intf_hdl *pintfhdl = &(pio_priv->intf); struct intf_hdl *pintfhdl = &(pio_priv->intf);
int (*_write8)(struct intf_hdl *pintfhdl, u32 addr, u8 val); int (*_write8)(struct intf_hdl *pintfhdl, u32 addr, u8 val);
int ret; int ret;
_func_enter_;
_write8 = pintfhdl->io_ops._write8; _write8 = pintfhdl->io_ops._write8;
ret = _write8(pintfhdl, addr, val); ret = _write8(pintfhdl, addr, val);
_func_exit_;
return RTW_STATUS_CODE(ret); return RTW_STATUS_CODE(ret);
} }
@ -115,11 +115,11 @@ int _rtw_write16(struct adapter *adapter, u32 addr, u16 val)
struct intf_hdl *pintfhdl = &(pio_priv->intf); struct intf_hdl *pintfhdl = &(pio_priv->intf);
int (*_write16)(struct intf_hdl *pintfhdl, u32 addr, u16 val); int (*_write16)(struct intf_hdl *pintfhdl, u32 addr, u16 val);
int ret; int ret;
_func_enter_;
_write16 = pintfhdl->io_ops._write16; _write16 = pintfhdl->io_ops._write16;
ret = _write16(pintfhdl, addr, val); ret = _write16(pintfhdl, addr, val);
_func_exit_;
return RTW_STATUS_CODE(ret); return RTW_STATUS_CODE(ret);
} }
@ -129,11 +129,11 @@ int _rtw_write32(struct adapter *adapter, u32 addr, u32 val)
struct intf_hdl *pintfhdl = &(pio_priv->intf); struct intf_hdl *pintfhdl = &(pio_priv->intf);
int (*_write32)(struct intf_hdl *pintfhdl, u32 addr, u32 val); int (*_write32)(struct intf_hdl *pintfhdl, u32 addr, u32 val);
int ret; int ret;
_func_enter_;
_write32 = pintfhdl->io_ops._write32; _write32 = pintfhdl->io_ops._write32;
ret = _write32(pintfhdl, addr, val); ret = _write32(pintfhdl, addr, val);
_func_exit_;
return RTW_STATUS_CODE(ret); return RTW_STATUS_CODE(ret);
} }
@ -144,11 +144,11 @@ int _rtw_writeN(struct adapter *adapter, u32 addr , u32 length , u8 *pdata)
struct intf_hdl *pintfhdl = (struct intf_hdl *)(&(pio_priv->intf)); struct intf_hdl *pintfhdl = (struct intf_hdl *)(&(pio_priv->intf));
int (*_writeN)(struct intf_hdl *pintfhdl, u32 addr, u32 length, u8 *pdata); int (*_writeN)(struct intf_hdl *pintfhdl, u32 addr, u32 length, u8 *pdata);
int ret; int ret;
_func_enter_;
_writeN = pintfhdl->io_ops._writeN; _writeN = pintfhdl->io_ops._writeN;
ret = _writeN(pintfhdl, addr, length, pdata); ret = _writeN(pintfhdl, addr, length, pdata);
_func_exit_;
return RTW_STATUS_CODE(ret); return RTW_STATUS_CODE(ret);
} }
@ -158,11 +158,11 @@ int _rtw_write8_async(struct adapter *adapter, u32 addr, u8 val)
struct intf_hdl *pintfhdl = &(pio_priv->intf); struct intf_hdl *pintfhdl = &(pio_priv->intf);
int (*_write8_async)(struct intf_hdl *pintfhdl, u32 addr, u8 val); int (*_write8_async)(struct intf_hdl *pintfhdl, u32 addr, u8 val);
int ret; int ret;
_func_enter_;
_write8_async = pintfhdl->io_ops._write8_async; _write8_async = pintfhdl->io_ops._write8_async;
ret = _write8_async(pintfhdl, addr, val); ret = _write8_async(pintfhdl, addr, val);
_func_exit_;
return RTW_STATUS_CODE(ret); return RTW_STATUS_CODE(ret);
} }
@ -174,10 +174,10 @@ int _rtw_write16_async(struct adapter *adapter, u32 addr, u16 val)
int (*_write16_async)(struct intf_hdl *pintfhdl, u32 addr, u16 val); int (*_write16_async)(struct intf_hdl *pintfhdl, u32 addr, u16 val);
int ret; int ret;
_func_enter_;
_write16_async = pintfhdl->io_ops._write16_async; _write16_async = pintfhdl->io_ops._write16_async;
ret = _write16_async(pintfhdl, addr, val); ret = _write16_async(pintfhdl, addr, val);
_func_exit_;
return RTW_STATUS_CODE(ret); return RTW_STATUS_CODE(ret);
} }
@ -189,10 +189,10 @@ int _rtw_write32_async(struct adapter *adapter, u32 addr, u32 val)
int (*_write32_async)(struct intf_hdl *pintfhdl, u32 addr, u32 val); int (*_write32_async)(struct intf_hdl *pintfhdl, u32 addr, u32 val);
int ret; int ret;
_func_enter_;
_write32_async = pintfhdl->io_ops._write32_async; _write32_async = pintfhdl->io_ops._write32_async;
ret = _write32_async(pintfhdl, addr, val); ret = _write32_async(pintfhdl, addr, val);
_func_exit_;
return RTW_STATUS_CODE(ret); return RTW_STATUS_CODE(ret);
} }
@ -203,7 +203,7 @@ void _rtw_read_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
struct intf_hdl *pintfhdl = &(pio_priv->intf); struct intf_hdl *pintfhdl = &(pio_priv->intf);
_func_enter_;
if (adapter->bDriverStopped || adapter->bSurpriseRemoved) { if (adapter->bDriverStopped || adapter->bSurpriseRemoved) {
RT_TRACE(_module_rtl871x_io_c_, _drv_info_, RT_TRACE(_module_rtl871x_io_c_, _drv_info_,
("rtw_read_mem:bDriverStopped(%d) OR bSurpriseRemoved(%d)", ("rtw_read_mem:bDriverStopped(%d) OR bSurpriseRemoved(%d)",
@ -212,7 +212,7 @@ void _rtw_read_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
} }
_read_mem = pintfhdl->io_ops._read_mem; _read_mem = pintfhdl->io_ops._read_mem;
_read_mem(pintfhdl, addr, cnt, pmem); _read_mem(pintfhdl, addr, cnt, pmem);
_func_exit_;
} }
void _rtw_write_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem) void _rtw_write_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
@ -221,13 +221,13 @@ void _rtw_write_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
struct intf_hdl *pintfhdl = &(pio_priv->intf); struct intf_hdl *pintfhdl = &(pio_priv->intf);
_func_enter_;
_write_mem = pintfhdl->io_ops._write_mem; _write_mem = pintfhdl->io_ops._write_mem;
_write_mem(pintfhdl, addr, cnt, pmem); _write_mem(pintfhdl, addr, cnt, pmem);
_func_exit_;
} }
void _rtw_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem) void _rtw_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
@ -236,7 +236,7 @@ void _rtw_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
struct intf_hdl *pintfhdl = &(pio_priv->intf); struct intf_hdl *pintfhdl = &(pio_priv->intf);
_func_enter_;
if (adapter->bDriverStopped || adapter->bSurpriseRemoved) { if (adapter->bDriverStopped || adapter->bSurpriseRemoved) {
RT_TRACE(_module_rtl871x_io_c_, _drv_info_, RT_TRACE(_module_rtl871x_io_c_, _drv_info_,
@ -249,7 +249,7 @@ void _rtw_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
_read_port(pintfhdl, addr, cnt, pmem); _read_port(pintfhdl, addr, cnt, pmem);
_func_exit_;
} }
void _rtw_read_port_cancel(struct adapter *adapter) void _rtw_read_port_cancel(struct adapter *adapter)
@ -271,13 +271,13 @@ u32 _rtw_write_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
struct intf_hdl *pintfhdl = &(pio_priv->intf); struct intf_hdl *pintfhdl = &(pio_priv->intf);
u32 ret = _SUCCESS; u32 ret = _SUCCESS;
_func_enter_;
_write_port = pintfhdl->io_ops._write_port; _write_port = pintfhdl->io_ops._write_port;
ret = _write_port(pintfhdl, addr, cnt, pmem); ret = _write_port(pintfhdl, addr, cnt, pmem);
_func_exit_;
return ret; return ret;
} }

48
core/rtw_ioctl_set.c
View file

@ -42,7 +42,7 @@ u8 rtw_validate_ssid(struct ndis_802_11_ssid *ssid)
u8 i; u8 i;
u8 ret = true; u8 ret = true;
_func_enter_;
if (ssid->SsidLength > 32) { if (ssid->SsidLength > 32) {
RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("ssid length >32\n")); RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("ssid length >32\n"));
@ -61,7 +61,7 @@ _func_enter_;
exit: exit:
_func_exit_;
return ret; return ret;
} }
@ -74,7 +74,7 @@ u8 rtw_do_join(struct adapter *padapter)
struct __queue *queue = &(pmlmepriv->scanned_queue); struct __queue *queue = &(pmlmepriv->scanned_queue);
u8 ret = _SUCCESS; u8 ret = _SUCCESS;
_func_enter_;
spin_lock_bh(&pmlmepriv->scanned_queue.lock); spin_lock_bh(&pmlmepriv->scanned_queue.lock);
phead = get_list_head(queue); phead = get_list_head(queue);
@ -170,7 +170,7 @@ _func_enter_;
exit: exit:
_func_exit_;
return ret; return ret;
} }
@ -181,7 +181,7 @@ u8 rtw_set_802_11_bssid(struct adapter *padapter, u8 *bssid)
u32 cur_time = 0; u32 cur_time = 0;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_func_enter_;
DBG_88E_LEVEL(_drv_info_, "set bssid:%pM\n", bssid); DBG_88E_LEVEL(_drv_info_, "set bssid:%pM\n", bssid);
@ -257,7 +257,7 @@ exit:
RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_,
("rtw_set_802_11_bssid: status=%d\n", status)); ("rtw_set_802_11_bssid: status=%d\n", status));
_func_exit_;
return status; return status;
} }
@ -270,7 +270,7 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *ssid)
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wlan_network *pnetwork = &pmlmepriv->cur_network; struct wlan_network *pnetwork = &pmlmepriv->cur_network;
_func_enter_;
DBG_88E_LEVEL(_drv_info_, "set ssid [%s] fw_state=0x%08x\n", DBG_88E_LEVEL(_drv_info_, "set ssid [%s] fw_state=0x%08x\n",
ssid->Ssid, get_fwstate(pmlmepriv)); ssid->Ssid, get_fwstate(pmlmepriv));
@ -369,7 +369,7 @@ release_mlme_lock:
exit: exit:
RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_,
("-rtw_set_802_11_ssid: status =%d\n", status)); ("-rtw_set_802_11_ssid: status =%d\n", status));
_func_exit_;
return status; return status;
} }
@ -380,7 +380,7 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter,
struct wlan_network *cur_network = &pmlmepriv->cur_network; struct wlan_network *cur_network = &pmlmepriv->cur_network;
enum ndis_802_11_network_infra *pold_state = &(cur_network->network.InfrastructureMode); enum ndis_802_11_network_infra *pold_state = &(cur_network->network.InfrastructureMode);
_func_enter_;
RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_notice_, RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_notice_,
("+rtw_set_802_11_infrastructure_mode: old =%d new =%d fw_state = 0x%08x\n", ("+rtw_set_802_11_infrastructure_mode: old =%d new =%d fw_state = 0x%08x\n",
@ -438,7 +438,7 @@ _func_enter_;
spin_unlock_bh(&pmlmepriv->lock); spin_unlock_bh(&pmlmepriv->lock);
} }
_func_exit_;
return true; return true;
} }
@ -448,7 +448,7 @@ u8 rtw_set_802_11_disassociate(struct adapter *padapter)
{ {
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_func_enter_;
spin_lock_bh(&pmlmepriv->lock); spin_lock_bh(&pmlmepriv->lock);
@ -464,7 +464,7 @@ _func_enter_;
spin_unlock_bh(&pmlmepriv->lock); spin_unlock_bh(&pmlmepriv->lock);
_func_exit_;
return true; return true;
} }
@ -474,7 +474,7 @@ u8 rtw_set_802_11_bssid_list_scan(struct adapter *padapter, struct ndis_802_11_s
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
u8 res = true; u8 res = true;
_func_enter_;
RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("+rtw_set_802_11_bssid_list_scan(), fw_state =%x\n", get_fwstate(pmlmepriv))); RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("+rtw_set_802_11_bssid_list_scan(), fw_state =%x\n", get_fwstate(pmlmepriv)));
@ -514,7 +514,7 @@ _func_enter_;
} }
exit: exit:
_func_exit_;
return res; return res;
} }
@ -525,7 +525,7 @@ u8 rtw_set_802_11_authentication_mode(struct adapter *padapter, enum ndis_802_11
int res; int res;
u8 ret; u8 ret;
_func_enter_;
RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, ("set_802_11_auth.mode(): mode =%x\n", authmode)); RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, ("set_802_11_auth.mode(): mode =%x\n", authmode));
@ -545,7 +545,7 @@ _func_enter_;
else else
ret = false; ret = false;
_func_exit_;
return ret; return ret;
} }
@ -556,7 +556,7 @@ u8 rtw_set_802_11_add_wep(struct adapter *padapter, struct ndis_802_11_wep *wep)
struct security_priv *psecuritypriv = &(padapter->securitypriv); struct security_priv *psecuritypriv = &(padapter->securitypriv);
u8 ret = _SUCCESS; u8 ret = _SUCCESS;
_func_enter_;
keyid = wep->KeyIndex & 0x3fffffff; keyid = wep->KeyIndex & 0x3fffffff;
@ -611,7 +611,7 @@ _func_enter_;
if (res == _FAIL) if (res == _FAIL)
ret = false; ret = false;
exit: exit:
_func_exit_;
return ret; return ret;
} }
@ -619,7 +619,7 @@ u8 rtw_set_802_11_remove_wep(struct adapter *padapter, u32 keyindex)
{ {
u8 ret = _SUCCESS; u8 ret = _SUCCESS;
_func_enter_;
if (keyindex >= 0x80000000 || padapter == NULL) { if (keyindex >= 0x80000000 || padapter == NULL) {
ret = false; ret = false;
goto exit; goto exit;
@ -638,7 +638,7 @@ _func_enter_;
} }
exit: exit:
_func_exit_;
return ret; return ret;
} }
@ -651,7 +651,7 @@ u8 rtw_set_802_11_add_key(struct adapter *padapter, struct ndis_802_11_key *key)
u8 bgrouptkey = false;/* can be removed later */ u8 bgrouptkey = false;/* can be removed later */
u8 ret = _SUCCESS; u8 ret = _SUCCESS;
_func_enter_;
if (((key->KeyIndex & 0x80000000) == 0) && ((key->KeyIndex & 0x40000000) > 0)) { if (((key->KeyIndex & 0x80000000) == 0) && ((key->KeyIndex & 0x40000000) > 0)) {
/* It is invalid to clear bit 31 and set bit 30. If the miniport driver encounters this combination, */ /* It is invalid to clear bit 31 and set bit 30. If the miniport driver encounters this combination, */
@ -992,7 +992,7 @@ _func_enter_;
} }
exit: exit:
_func_exit_;
return ret; return ret;
} }
@ -1004,7 +1004,7 @@ u8 rtw_set_802_11_remove_key(struct adapter *padapter, struct ndis_802_11_remove
u8 keyIndex = (u8)key->KeyIndex & 0x03; u8 keyIndex = (u8)key->KeyIndex & 0x03;
u8 ret = _SUCCESS; u8 ret = _SUCCESS;
_func_enter_;
if ((key->KeyIndex & 0xbffffffc) > 0) { if ((key->KeyIndex & 0xbffffffc) > 0) {
ret = _FAIL; ret = _FAIL;
@ -1032,7 +1032,7 @@ _func_enter_;
} }
exit: exit:
_func_exit_;
return ret; return ret;
} }

191
core/rtw_mlme.c
View file

@ -56,7 +56,7 @@ int _rtw_init_mlme_priv (struct adapter *padapter)
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
int res = _SUCCESS; int res = _SUCCESS;
_func_enter_;
/* We don't need to memset padapter->XXX to zero, because adapter is allocated by rtw_zvmalloc(). */ /* We don't need to memset padapter->XXX to zero, because adapter is allocated by rtw_zvmalloc(). */
@ -101,7 +101,7 @@ _func_enter_;
exit: exit:
_func_exit_;
return res; return res;
} }
@ -144,7 +144,7 @@ void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv)
void _rtw_free_mlme_priv (struct mlme_priv *pmlmepriv) void _rtw_free_mlme_priv (struct mlme_priv *pmlmepriv)
{ {
_func_enter_;
rtw_free_mlme_priv_ie_data(pmlmepriv); rtw_free_mlme_priv_ie_data(pmlmepriv);
@ -155,12 +155,12 @@ _func_enter_;
rtw_vmfree(pmlmepriv->free_bss_buf, MAX_BSS_CNT * sizeof(struct wlan_network)); rtw_vmfree(pmlmepriv->free_bss_buf, MAX_BSS_CNT * sizeof(struct wlan_network));
} }
} }
_func_exit_;
} }
int _rtw_enqueue_network(struct __queue *queue, struct wlan_network *pnetwork) int _rtw_enqueue_network(struct __queue *queue, struct wlan_network *pnetwork)
{ {
_func_enter_;
if (pnetwork == NULL) if (pnetwork == NULL)
goto exit; goto exit;
@ -173,7 +173,7 @@ _func_enter_;
exit: exit:
_func_exit_;
return _SUCCESS; return _SUCCESS;
} }
@ -182,7 +182,7 @@ struct wlan_network *_rtw_dequeue_network(struct __queue *queue)
{ {
struct wlan_network *pnetwork; struct wlan_network *pnetwork;
_func_enter_;
spin_lock_bh(&queue->lock); spin_lock_bh(&queue->lock);
@ -196,7 +196,7 @@ _func_enter_;
spin_unlock_bh(&queue->lock); spin_unlock_bh(&queue->lock);
_func_exit_;
return pnetwork; return pnetwork;
} }
@ -207,7 +207,7 @@ struct wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv)/* _queue *f
struct __queue *free_queue = &pmlmepriv->free_bss_pool; struct __queue *free_queue = &pmlmepriv->free_bss_pool;
struct list_head *plist = NULL; struct list_head *plist = NULL;
_func_enter_;
spin_lock_bh(&free_queue->lock); spin_lock_bh(&free_queue->lock);
@ -233,7 +233,7 @@ _func_enter_;
exit: exit:
spin_unlock_bh(&free_queue->lock); spin_unlock_bh(&free_queue->lock);
_func_exit_;
return pnetwork; return pnetwork;
} }
@ -244,13 +244,11 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv , struct wlan_network *pnetwo
u32 lifetime = SCANQUEUE_LIFETIME; u32 lifetime = SCANQUEUE_LIFETIME;
struct __queue *free_queue = &(pmlmepriv->free_bss_pool); struct __queue *free_queue = &(pmlmepriv->free_bss_pool);
_func_enter_;
if (pnetwork == NULL) if (pnetwork == NULL)
goto exit; return;
if (pnetwork->fixed) if (pnetwork->fixed)
goto exit; return;
curr_time = rtw_get_current_time(); curr_time = rtw_get_current_time();
if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) || if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) ||
(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE))) (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)))
@ -258,33 +256,26 @@ _func_enter_;
if (!isfreeall) { if (!isfreeall) {
delta_time = (curr_time - pnetwork->last_scanned)/HZ; delta_time = (curr_time - pnetwork->last_scanned)/HZ;
if (delta_time < lifetime)/* unit:sec */ if (delta_time < lifetime)/* unit:sec */
goto exit; return;
} }
spin_lock_bh(&free_queue->lock); spin_lock_bh(&free_queue->lock);
rtw_list_delete(&(pnetwork->list)); rtw_list_delete(&(pnetwork->list));
rtw_list_insert_tail(&(pnetwork->list), &(free_queue->queue)); rtw_list_insert_tail(&(pnetwork->list), &(free_queue->queue));
pmlmepriv->num_of_scanned--; pmlmepriv->num_of_scanned--;
spin_unlock_bh(&free_queue->lock); spin_unlock_bh(&free_queue->lock);
exit:
_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)
{ {
struct __queue *free_queue = &(pmlmepriv->free_bss_pool); struct __queue *free_queue = &(pmlmepriv->free_bss_pool);
_func_enter_;
if (pnetwork == NULL) if (pnetwork == NULL)
goto exit; return;
if (pnetwork->fixed) if (pnetwork->fixed)
goto exit; return;
rtw_list_delete(&(pnetwork->list)); rtw_list_delete(&(pnetwork->list));
rtw_list_insert_tail(&(pnetwork->list), get_list_head(free_queue)); rtw_list_insert_tail(&(pnetwork->list), get_list_head(free_queue));
pmlmepriv->num_of_scanned--; pmlmepriv->num_of_scanned--;
exit:
_func_exit_;
} }
/* /*
@ -298,7 +289,7 @@ struct wlan_network *_rtw_find_network(struct __queue *scanned_queue, u8 *addr)
struct wlan_network *pnetwork = NULL; struct wlan_network *pnetwork = NULL;
u8 zero_addr[ETH_ALEN] = {0, 0, 0, 0, 0, 0}; u8 zero_addr[ETH_ALEN] = {0, 0, 0, 0, 0, 0};
_func_enter_;
if (_rtw_memcmp(zero_addr, addr, ETH_ALEN)) { if (_rtw_memcmp(zero_addr, addr, ETH_ALEN)) {
pnetwork = NULL; pnetwork = NULL;
goto exit; goto exit;
@ -315,7 +306,7 @@ _func_enter_;
if (plist == phead) if (plist == phead)
pnetwork = NULL; pnetwork = NULL;
exit: exit:
_func_exit_;
return pnetwork; return pnetwork;
} }
@ -327,7 +318,7 @@ void _rtw_free_network_queue(struct adapter *padapter, u8 isfreeall)
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct __queue *scanned_queue = &pmlmepriv->scanned_queue; struct __queue *scanned_queue = &pmlmepriv->scanned_queue;
_func_enter_;
spin_lock_bh(&scanned_queue->lock); spin_lock_bh(&scanned_queue->lock);
@ -343,13 +334,13 @@ _func_enter_;
_rtw_free_network(pmlmepriv, pnetwork, isfreeall); _rtw_free_network(pmlmepriv, pnetwork, isfreeall);
} }
spin_unlock_bh(&scanned_queue->lock); spin_unlock_bh(&scanned_queue->lock);
_func_exit_;
} }
int rtw_if_up(struct adapter *padapter) int rtw_if_up(struct adapter *padapter)
{ {
int res; int res;
_func_enter_;
if (padapter->bDriverStopped || padapter->bSurpriseRemoved || if (padapter->bDriverStopped || padapter->bSurpriseRemoved ||
(check_fwstate(&padapter->mlmepriv, _FW_LINKED) == false)) { (check_fwstate(&padapter->mlmepriv, _FW_LINKED) == false)) {
@ -361,7 +352,7 @@ _func_enter_;
res = true; res = true;
} }
_func_exit_;
return res; return res;
} }
@ -369,14 +360,14 @@ void rtw_generate_random_ibss(u8 *pibss)
{ {
u32 curtime = rtw_get_current_time(); u32 curtime = rtw_get_current_time();
_func_enter_;
pibss[0] = 0x02; /* in ad-hoc mode bit1 must set to 1 */ pibss[0] = 0x02; /* in ad-hoc mode bit1 must set to 1 */
pibss[1] = 0x11; pibss[1] = 0x11;
pibss[2] = 0x87; pibss[2] = 0x87;
pibss[3] = (u8)(curtime & 0xff);/* p[0]; */ pibss[3] = (u8)(curtime & 0xff);/* p[0]; */
pibss[4] = (u8)((curtime>>8) & 0xff);/* p[1]; */ pibss[4] = (u8)((curtime>>8) & 0xff);/* p[1]; */
pibss[5] = (u8)((curtime>>16) & 0xff);/* p[2]; */ pibss[5] = (u8)((curtime>>16) & 0xff);/* p[2]; */
_func_exit_;
return; return;
} }
@ -389,11 +380,11 @@ u8 *rtw_get_capability_from_ie(u8 *ie)
u16 rtw_get_capability(struct wlan_bssid_ex *bss) u16 rtw_get_capability(struct wlan_bssid_ex *bss)
{ {
__le16 val; __le16 val;
_func_enter_;
memcpy((u8 *)&val, rtw_get_capability_from_ie(bss->IEs), 2); memcpy((u8 *)&val, rtw_get_capability_from_ie(bss->IEs), 2);
_func_exit_;
return le16_to_cpu(val); return le16_to_cpu(val);
} }
@ -410,43 +401,43 @@ u8 *rtw_get_beacon_interval_from_ie(u8 *ie)
int rtw_init_mlme_priv (struct adapter *padapter)/* struct mlme_priv *pmlmepriv) */ int rtw_init_mlme_priv (struct adapter *padapter)/* struct mlme_priv *pmlmepriv) */
{ {
int res; int res;
_func_enter_;
res = _rtw_init_mlme_priv(padapter);/* (pmlmepriv); */ res = _rtw_init_mlme_priv(padapter);/* (pmlmepriv); */
_func_exit_;
return res; return res;
} }
void rtw_free_mlme_priv (struct mlme_priv *pmlmepriv) void rtw_free_mlme_priv (struct mlme_priv *pmlmepriv)
{ {
_func_enter_;
RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("rtw_free_mlme_priv\n")); RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("rtw_free_mlme_priv\n"));
_rtw_free_mlme_priv (pmlmepriv); _rtw_free_mlme_priv (pmlmepriv);
_func_exit_;
} }
static struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv) static struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv)
{ {
struct wlan_network *pnetwork; struct wlan_network *pnetwork;
_func_enter_;
pnetwork = _rtw_alloc_network(pmlmepriv); pnetwork = _rtw_alloc_network(pmlmepriv);
_func_exit_;
return pnetwork; return pnetwork;
} }
static void rtw_free_network_nolock(struct mlme_priv *pmlmepriv, static void rtw_free_network_nolock(struct mlme_priv *pmlmepriv,
struct wlan_network *pnetwork) struct wlan_network *pnetwork)
{ {
_func_enter_;
_rtw_free_network_nolock(pmlmepriv, pnetwork); _rtw_free_network_nolock(pmlmepriv, pnetwork);
_func_exit_;
} }
void rtw_free_network_queue(struct adapter *dev, u8 isfreeall) void rtw_free_network_queue(struct adapter *dev, u8 isfreeall)
{ {
_func_enter_;
_rtw_free_network_queue(dev, isfreeall); _rtw_free_network_queue(dev, isfreeall);
_func_exit_;
} }
/* /*
@ -488,7 +479,7 @@ int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst)
u16 s_cap, d_cap; u16 s_cap, d_cap;
__le16 le_scap, le_dcap; __le16 le_scap, le_dcap;
_func_enter_;
memcpy((u8 *)&le_scap, rtw_get_capability_from_ie(src->IEs), 2); memcpy((u8 *)&le_scap, rtw_get_capability_from_ie(src->IEs), 2);
memcpy((u8 *)&le_dcap, rtw_get_capability_from_ie(dst->IEs), 2); memcpy((u8 *)&le_dcap, rtw_get_capability_from_ie(dst->IEs), 2);
@ -496,7 +487,7 @@ _func_enter_;
s_cap = le16_to_cpu(le_scap); s_cap = le16_to_cpu(le_scap);
d_cap = le16_to_cpu(le_dcap); d_cap = le16_to_cpu(le_dcap);
_func_exit_;
return ((src->Ssid.SsidLength == dst->Ssid.SsidLength) && return ((src->Ssid.SsidLength == dst->Ssid.SsidLength) &&
((_rtw_memcmp(src->MacAddress, dst->MacAddress, ETH_ALEN)) == true) && ((_rtw_memcmp(src->MacAddress, dst->MacAddress, ETH_ALEN)) == true) &&
@ -513,7 +504,7 @@ struct wlan_network *rtw_get_oldest_wlan_network(struct __queue *scanned_queue)
struct wlan_network *pwlan = NULL; struct wlan_network *pwlan = NULL;
struct wlan_network *oldest = NULL; struct wlan_network *oldest = NULL;
_func_enter_;
phead = get_list_head(scanned_queue); phead = get_list_head(scanned_queue);
plist = get_next(phead); plist = get_next(phead);
@ -531,7 +522,7 @@ _func_enter_;
plist = get_next(plist); plist = get_next(plist);
} }
_func_exit_;
return oldest; return oldest;
} }
@ -544,7 +535,7 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src,
u8 sq_final; u8 sq_final;
long rssi_final; long rssi_final;
_func_enter_;
rtw_hal_antdiv_rssi_compared(padapter, dst, src); /* this will update src.Rssi, need consider again */ rtw_hal_antdiv_rssi_compared(padapter, dst, src); /* this will update src.Rssi, need consider again */
/* The rule below is 1/5 for sample value, 4/5 for history value */ /* The rule below is 1/5 for sample value, 4/5 for history value */
@ -578,14 +569,14 @@ _func_enter_;
dst->PhyInfo.SignalQuality = sq_final; dst->PhyInfo.SignalQuality = sq_final;
dst->Rssi = rssi_final; dst->Rssi = rssi_final;
_func_exit_;
} }
static void update_current_network(struct adapter *adapter, struct wlan_bssid_ex *pnetwork) static void update_current_network(struct adapter *adapter, struct wlan_bssid_ex *pnetwork)
{ {
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
_func_enter_;
if ((check_fwstate(pmlmepriv, _FW_LINKED) == true) && if ((check_fwstate(pmlmepriv, _FW_LINKED) == true) &&
(is_same_network(&(pmlmepriv->cur_network.network), pnetwork))) { (is_same_network(&(pmlmepriv->cur_network.network), pnetwork))) {
@ -593,7 +584,7 @@ _func_enter_;
rtw_update_protection(adapter, (pmlmepriv->cur_network.network.IEs) + sizeof(struct ndis_802_11_fixed_ie), rtw_update_protection(adapter, (pmlmepriv->cur_network.network.IEs) + sizeof(struct ndis_802_11_fixed_ie),
pmlmepriv->cur_network.network.IELength); pmlmepriv->cur_network.network.IELength);
} }
_func_exit_;
} }
/* /*
@ -611,7 +602,7 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t
struct wifidirect_info *pwdinfo= &(adapter->wdinfo); struct wifidirect_info *pwdinfo= &(adapter->wdinfo);
int target_find = 0; int target_find = 0;
_func_enter_;
spin_lock_bh(&queue->lock); spin_lock_bh(&queue->lock);
phead = get_list_head(queue); phead = get_list_head(queue);
@ -696,19 +687,19 @@ _func_enter_;
exit: exit:
spin_unlock_bh(&queue->lock); spin_unlock_bh(&queue->lock);
_func_exit_;
} }
static void rtw_add_network(struct adapter *adapter, static void rtw_add_network(struct adapter *adapter,
struct wlan_bssid_ex *pnetwork) struct wlan_bssid_ex *pnetwork)
{ {
_func_enter_;
#if defined(CONFIG_88EU_P2P) #if defined(CONFIG_88EU_P2P)
rtw_wlan_bssid_ex_remove_p2p_attr(pnetwork, P2P_ATTR_GROUP_INFO); rtw_wlan_bssid_ex_remove_p2p_attr(pnetwork, P2P_ATTR_GROUP_INFO);
#endif #endif
update_current_network(adapter, pnetwork); update_current_network(adapter, pnetwork);
rtw_update_scanned_network(adapter, pnetwork); rtw_update_scanned_network(adapter, pnetwork);
_func_exit_;
} }
/* select the desired network based on the capability of the (i)bss. */ /* select the desired network based on the capability of the (i)bss. */
@ -774,9 +765,9 @@ static int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *
/* TODO: Perry: For Power Management */ /* TODO: Perry: For Power Management */
void rtw_atimdone_event_callback(struct adapter *adapter , u8 *pbuf) void rtw_atimdone_event_callback(struct adapter *adapter , u8 *pbuf)
{ {
_func_enter_;
RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("receive atimdone_evet\n")); RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("receive atimdone_evet\n"));
_func_exit_;
return; return;
} }
@ -787,7 +778,7 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf)
struct wlan_bssid_ex *pnetwork; struct wlan_bssid_ex *pnetwork;
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
_func_enter_;
pnetwork = (struct wlan_bssid_ex *)pbuf; pnetwork = (struct wlan_bssid_ex *)pbuf;
@ -828,7 +819,7 @@ exit:
spin_unlock_bh(&pmlmepriv->lock); spin_unlock_bh(&pmlmepriv->lock);
_func_exit_;
return; return;
} }
@ -841,7 +832,7 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)
struct mlme_ext_priv *pmlmeext; struct mlme_ext_priv *pmlmeext;
u8 timer_cancelled = 0; u8 timer_cancelled = 0;
_func_enter_;
spin_lock_bh(&pmlmepriv->lock); spin_lock_bh(&pmlmepriv->lock);
if (pmlmepriv->wps_probe_req_ie) { if (pmlmepriv->wps_probe_req_ie) {
@ -936,7 +927,7 @@ _func_enter_;
rtw_os_xmit_schedule(adapter); rtw_os_xmit_schedule(adapter);
pmlmeext = &adapter->mlmeextpriv; pmlmeext = &adapter->mlmeextpriv;
_func_exit_;
} }
void rtw_dummy_event_callback(struct adapter *adapter , u8 *pbuf) void rtw_dummy_event_callback(struct adapter *adapter , u8 *pbuf)
@ -953,7 +944,7 @@ static void free_scanqueue(struct mlme_priv *pmlmepriv)
struct __queue *scan_queue = &pmlmepriv->scanned_queue; struct __queue *scan_queue = &pmlmepriv->scanned_queue;
struct list_head *plist, *phead, *ptemp; struct list_head *plist, *phead, *ptemp;
_func_enter_;
RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, ("+free_scanqueue\n")); RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, ("+free_scanqueue\n"));
spin_lock_bh(&scan_queue->lock); spin_lock_bh(&scan_queue->lock);
@ -973,7 +964,7 @@ _func_enter_;
spin_unlock_bh(&free_queue->lock); spin_unlock_bh(&free_queue->lock);
spin_unlock_bh(&scan_queue->lock); spin_unlock_bh(&scan_queue->lock);
_func_exit_;
} }
/* /*
@ -986,7 +977,7 @@ void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_queue)
struct sta_priv *pstapriv = &adapter->stapriv; struct sta_priv *pstapriv = &adapter->stapriv;
struct wlan_network *tgt_network = &pmlmepriv->cur_network; struct wlan_network *tgt_network = &pmlmepriv->cur_network;
_func_enter_;
RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, ("+rtw_free_assoc_resources\n")); RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, ("+rtw_free_assoc_resources\n"));
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,
@ -1031,7 +1022,7 @@ _func_enter_;
if (lock_scanned_queue) if (lock_scanned_queue)
spin_unlock_bh(&pmlmepriv->scanned_queue.lock); spin_unlock_bh(&pmlmepriv->scanned_queue.lock);
pmlmepriv->key_mask = 0; pmlmepriv->key_mask = 0;
_func_exit_;
} }
/* /*
@ -1041,7 +1032,7 @@ void rtw_indicate_connect(struct adapter *padapter)
{ {
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_func_enter_;
RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("+rtw_indicate_connect\n")); RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("+rtw_indicate_connect\n"));
@ -1060,7 +1051,7 @@ _func_enter_;
rtw_set_scan_deny(padapter, 3000); rtw_set_scan_deny(padapter, 3000);
RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("-rtw_indicate_connect: fw_state=0x%08x\n", get_fwstate(pmlmepriv))); RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("-rtw_indicate_connect: fw_state=0x%08x\n", get_fwstate(pmlmepriv)));
_func_exit_;
} }
/* /*
@ -1070,7 +1061,7 @@ void rtw_indicate_disconnect(struct adapter *padapter)
{ {
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_func_enter_;
RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("+rtw_indicate_disconnect\n")); RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("+rtw_indicate_disconnect\n"));
_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING | WIFI_UNDER_WPS); _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING | WIFI_UNDER_WPS);
@ -1091,7 +1082,7 @@ _func_enter_;
rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_DISCONNECT, 1); rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_DISCONNECT, 1);
_func_exit_;
} }
inline void rtw_indicate_scan_done(struct adapter *padapter, bool aborted) inline void rtw_indicate_scan_done(struct adapter *padapter, bool aborted)
@ -1258,7 +1249,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)
struct wlan_network *pcur_wlan = NULL, *ptarget_wlan = NULL; struct wlan_network *pcur_wlan = NULL, *ptarget_wlan = NULL;
unsigned int the_same_macaddr = false; 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)); RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("joinbss event call back received with res=%d\n", pnetwork->join_res));
@ -1275,7 +1266,7 @@ _func_enter_;
pnetwork->network.Length = get_wlan_bssid_ex_sz(&pnetwork->network); pnetwork->network.Length = get_wlan_bssid_ex_sz(&pnetwork->network);
if (pnetwork->network.Length > sizeof(struct wlan_bssid_ex)) { if (pnetwork->network.Length > sizeof(struct wlan_bssid_ex)) {
RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("\n\n ***joinbss_evt_callback return a wrong bss ***\n\n")); RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("\n\n ***joinbss_evt_callback return a wrong bss ***\n\n"));
goto ignore_nolock; return;
} }
spin_lock_bh(&pmlmepriv->lock); spin_lock_bh(&pmlmepriv->lock);
@ -1372,21 +1363,19 @@ _func_enter_;
ignore_joinbss_callback: ignore_joinbss_callback:
spin_unlock_bh(&pmlmepriv->lock); spin_unlock_bh(&pmlmepriv->lock);
ignore_nolock:
_func_exit_;
} }
void rtw_joinbss_event_callback(struct adapter *adapter, u8 *pbuf) void rtw_joinbss_event_callback(struct adapter *adapter, u8 *pbuf)
{ {
struct wlan_network *pnetwork = (struct wlan_network *)pbuf; struct wlan_network *pnetwork = (struct wlan_network *)pbuf;
_func_enter_;
mlmeext_joinbss_event_callback(adapter, pnetwork->join_res); mlmeext_joinbss_event_callback(adapter, pnetwork->join_res);
rtw_os_xmit_schedule(adapter); rtw_os_xmit_schedule(adapter);
_func_exit_;
} }
static u8 search_max_mac_id(struct adapter *padapter) static u8 search_max_mac_id(struct adapter *padapter)
@ -1444,7 +1433,7 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)
struct wlan_network *cur_network = &(pmlmepriv->cur_network); struct wlan_network *cur_network = &(pmlmepriv->cur_network);
struct wlan_network *ptarget_wlan = NULL; struct wlan_network *ptarget_wlan = NULL;
_func_enter_;
if (rtw_access_ctrl(adapter, pstassoc->macaddr) == false) if (rtw_access_ctrl(adapter, pstassoc->macaddr) == false)
return; return;
@ -1454,7 +1443,7 @@ _func_enter_;
psta = rtw_get_stainfo(&adapter->stapriv, pstassoc->macaddr); psta = rtw_get_stainfo(&adapter->stapriv, pstassoc->macaddr);
if (psta) if (psta)
rtw_indicate_sta_assoc_event(adapter, psta); rtw_indicate_sta_assoc_event(adapter, psta);
goto exit; return;
} }
#endif #endif
/* for AD-HOC mode */ /* for AD-HOC mode */
@ -1462,12 +1451,12 @@ _func_enter_;
if (psta != NULL) { if (psta != NULL) {
/* the sta have been in sta_info_queue => do nothing */ /* the sta have been in sta_info_queue => do nothing */
RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("Error: rtw_stassoc_event_callback: sta has been in sta_hash_queue\n")); RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("Error: rtw_stassoc_event_callback: sta has been in sta_hash_queue\n"));
goto exit; /* between drv has received this event before and fw have not yet to set key to CAM_ENTRY) */ return; /* between drv has received this event before and fw have not yet to set key to CAM_ENTRY) */
} }
psta = rtw_alloc_stainfo(&adapter->stapriv, pstassoc->macaddr); psta = rtw_alloc_stainfo(&adapter->stapriv, pstassoc->macaddr);
if (psta == NULL) { if (psta == NULL) {
RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("Can't alloc sta_info when rtw_stassoc_event_callback\n")); RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("Can't alloc sta_info when rtw_stassoc_event_callback\n"));
goto exit; return;
} }
/* to do: init sta_info variable */ /* to do: init sta_info variable */
psta->qos_option = 0; psta->qos_option = 0;
@ -1495,8 +1484,6 @@ _func_enter_;
} }
spin_unlock_bh(&pmlmepriv->lock); spin_unlock_bh(&pmlmepriv->lock);
mlmeext_sta_add_event_callback(adapter, psta); mlmeext_sta_add_event_callback(adapter, psta);
exit:
_func_exit_;
} }
void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf) void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)
@ -1511,7 +1498,7 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)
struct sta_priv *pstapriv = &adapter->stapriv; struct sta_priv *pstapriv = &adapter->stapriv;
struct wlan_network *tgt_network = &(pmlmepriv->cur_network); struct wlan_network *tgt_network = &(pmlmepriv->cur_network);
_func_enter_;
psta = rtw_get_stainfo(&adapter->stapriv, pstadel->macaddr); psta = rtw_get_stainfo(&adapter->stapriv, pstadel->macaddr);
if (psta) if (psta)
@ -1599,14 +1586,14 @@ _func_enter_;
} }
} }
spin_unlock_bh(&pmlmepriv->lock); spin_unlock_bh(&pmlmepriv->lock);
_func_exit_;
} }
void rtw_cpwm_event_callback(struct adapter *padapter, u8 *pbuf) void rtw_cpwm_event_callback(struct adapter *padapter, u8 *pbuf)
{ {
_func_enter_;
RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("+rtw_cpwm_event_callback !!!\n")); RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("+rtw_cpwm_event_callback !!!\n"));
_func_exit_;
} }
/* /*
@ -1618,7 +1605,7 @@ void _rtw_join_timeout_handler (struct adapter *adapter)
struct mlme_priv *pmlmepriv = &adapter->mlmepriv; struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
int do_join_r; int do_join_r;
_func_enter_;
DBG_88E("%s, fw_state=%x\n", __func__, get_fwstate(pmlmepriv)); DBG_88E("%s, fw_state=%x\n", __func__, get_fwstate(pmlmepriv));
@ -1650,7 +1637,7 @@ _func_enter_;
free_scanqueue(pmlmepriv);/* */ free_scanqueue(pmlmepriv);/* */
} }
spin_unlock_bh(&pmlmepriv->lock); spin_unlock_bh(&pmlmepriv->lock);
_func_exit_;
} }
/* /*
@ -1804,7 +1791,7 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv)
struct wlan_network *candidate = NULL; struct wlan_network *candidate = NULL;
u8 supp_ant_div = false; u8 supp_ant_div = false;
_func_enter_;
spin_lock_bh(&pmlmepriv->scanned_queue.lock); spin_lock_bh(&pmlmepriv->scanned_queue.lock);
phead = get_list_head(queue); phead = get_list_head(queue);
@ -1855,7 +1842,7 @@ _func_enter_;
exit: exit:
spin_unlock_bh(&pmlmepriv->scanned_queue.lock); spin_unlock_bh(&pmlmepriv->scanned_queue.lock);
_func_exit_;
return ret; return ret;
} }
@ -1867,7 +1854,7 @@ int rtw_set_auth(struct adapter *adapter, struct security_priv *psecuritypriv)
struct cmd_priv *pcmdpriv = &(adapter->cmdpriv); struct cmd_priv *pcmdpriv = &(adapter->cmdpriv);
int res = _SUCCESS; int res = _SUCCESS;
_func_enter_;
pcmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); pcmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (pcmd == NULL) { if (pcmd == NULL) {
@ -1894,7 +1881,7 @@ _func_enter_;
psecuritypriv->dot11AuthAlgrthm)); psecuritypriv->dot11AuthAlgrthm));
res = rtw_enqueue_cmd(pcmdpriv, pcmd); res = rtw_enqueue_cmd(pcmdpriv, pcmd);
exit: exit:
_func_exit_;
return res; return res;
} }
@ -1907,7 +1894,7 @@ int rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, in
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
int res = _SUCCESS; int res = _SUCCESS;
_func_enter_;
pcmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); pcmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (pcmd == NULL) { if (pcmd == NULL) {
res = _FAIL; /* try again */ res = _FAIL; /* try again */
@ -1976,7 +1963,7 @@ _func_enter_;
_rtw_init_listhead(&pcmd->list); _rtw_init_listhead(&pcmd->list);
res = rtw_enqueue_cmd(pcmdpriv, pcmd); res = rtw_enqueue_cmd(pcmdpriv, pcmd);
exit: exit:
_func_exit_;
return res; return res;
} }
@ -2080,7 +2067,7 @@ int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_
uint ndisauthmode = psecuritypriv->ndisauthtype; uint ndisauthmode = psecuritypriv->ndisauthtype;
uint ndissecuritytype = psecuritypriv->ndisencryptstatus; uint ndissecuritytype = psecuritypriv->ndisencryptstatus;
_func_enter_;
RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_,
("+rtw_restruct_sec_ie: ndisauthmode=%d ndissecuritytype=%d\n", ("+rtw_restruct_sec_ie: ndisauthmode=%d ndissecuritytype=%d\n",
@ -2115,7 +2102,7 @@ _func_enter_;
ielength = rtw_append_pmkid(adapter, iEntry, out_ie, ielength); ielength = rtw_append_pmkid(adapter, iEntry, out_ie, ielength);
} }
_func_exit_;
return ielength; return ielength;
} }
@ -2127,7 +2114,7 @@ void rtw_init_registrypriv_dev_network(struct adapter *adapter)
struct wlan_bssid_ex *pdev_network = &pregistrypriv->dev_network; struct wlan_bssid_ex *pdev_network = &pregistrypriv->dev_network;
u8 *myhwaddr = myid(peepriv); u8 *myhwaddr = myid(peepriv);
_func_enter_;
memcpy(pdev_network->MacAddress, myhwaddr, ETH_ALEN); memcpy(pdev_network->MacAddress, myhwaddr, ETH_ALEN);
@ -2140,7 +2127,7 @@ _func_enter_;
pdev_network->Configuration.FHConfig.HopSet = 0; pdev_network->Configuration.FHConfig.HopSet = 0;
pdev_network->Configuration.FHConfig.DwellTime = 0; pdev_network->Configuration.FHConfig.DwellTime = 0;
_func_exit_;
} }
void rtw_update_registrypriv_dev_network(struct adapter *adapter) void rtw_update_registrypriv_dev_network(struct adapter *adapter)
@ -2151,7 +2138,7 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter)
struct security_priv *psecuritypriv = &adapter->securitypriv; struct security_priv *psecuritypriv = &adapter->securitypriv;
struct wlan_network *cur_network = &adapter->mlmepriv.cur_network; struct wlan_network *cur_network = &adapter->mlmepriv.cur_network;
_func_enter_;
pdev_network->Privacy = (psecuritypriv->dot11PrivacyAlgrthm > 0 ? 1 : 0); /* adhoc no 802.1x */ pdev_network->Privacy = (psecuritypriv->dot11PrivacyAlgrthm > 0 ? 1 : 0); /* adhoc no 802.1x */
@ -2202,13 +2189,13 @@ _func_enter_;
/* notes: translate IELength & Length after assign the Length to cmdsz in createbss_cmd(); */ /* notes: translate IELength & Length after assign the Length to cmdsz in createbss_cmd(); */
/* pdev_network->IELength = cpu_to_le32(sz); */ /* pdev_network->IELength = cpu_to_le32(sz); */
_func_exit_;
} }
void rtw_get_encrypt_decrypt_from_registrypriv(struct adapter *adapter) void rtw_get_encrypt_decrypt_from_registrypriv(struct adapter *adapter)
{ {
_func_enter_;
_func_exit_;
} }
/* the function is at passive_level */ /* the function is at passive_level */

4
core/rtw_mlme_ext.c
View file

@ -8272,7 +8272,7 @@ u8 set_tx_beacon_cmd(struct adapter *padapter)
u8 res = _SUCCESS; u8 res = _SUCCESS;
int len_diff = 0; int len_diff = 0;
_func_enter_;
ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (ph2c == NULL) { if (ph2c == NULL) {
@ -8301,7 +8301,7 @@ _func_enter_;
exit: exit:
_func_exit_;
return res; return res;
} }

156
core/rtw_mp_ioctl.c
View file

@ -33,7 +33,7 @@ int rtl8188eu_oid_rt_wireless_mode_hdl(struct oid_par_priv *poid_par_priv)
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
if (poid_par_priv->information_buf_len < sizeof(u8)) if (poid_par_priv->information_buf_len < sizeof(u8))
return NDIS_STATUS_INVALID_LENGTH; return NDIS_STATUS_INVALID_LENGTH;
@ -48,7 +48,7 @@ _func_enter_;
status = NDIS_STATUS_NOT_ACCEPTED; status = NDIS_STATUS_NOT_ACCEPTED;
} }
_func_exit_;
return status; return status;
} }
@ -61,7 +61,7 @@ int rtl8188eu_oid_rt_pro_write_bb_reg_hdl(struct oid_par_priv *poid_par_priv)
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_write_bb_reg_hdl\n")); RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_write_bb_reg_hdl\n"));
@ -87,7 +87,7 @@ _func_enter_;
write_bbreg(Adapter, offset, 0xFFFFFFFF, value); write_bbreg(Adapter, offset, 0xFFFFFFFF, value);
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
_func_exit_;
return status; return status;
} }
@ -100,7 +100,7 @@ int rtl8188eu_oid_rt_pro_read_bb_reg_hdl(struct oid_par_priv *poid_par_priv)
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_read_bb_reg_hdl\n")); RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_read_bb_reg_hdl\n"));
@ -126,7 +126,7 @@ _func_enter_;
RT_TRACE(_module_mp_, _drv_notice_, RT_TRACE(_module_mp_, _drv_notice_,
("-rtl8188eu_oid_rt_pro_read_bb_reg_hdl: offset=0x%03X value:0x%08X\n", ("-rtl8188eu_oid_rt_pro_read_bb_reg_hdl: offset=0x%03X value:0x%08X\n",
offset, value)); offset, value));
_func_exit_;
return status; return status;
} }
@ -140,7 +140,7 @@ int rtl8188eu_oid_rt_pro_write_rf_reg_hdl(struct oid_par_priv *poid_par_priv)
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_write_rf_reg_hdl\n")); RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_write_rf_reg_hdl\n"));
@ -171,7 +171,7 @@ _func_enter_;
write_rfreg(Adapter, path, offset, value); write_rfreg(Adapter, path, offset, value);
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
_func_exit_;
return status; return status;
} }
@ -185,7 +185,7 @@ int rtl8188eu_oid_rt_pro_read_rf_reg_hdl(struct oid_par_priv *poid_par_priv)
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
_func_enter_;
RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_read_rf_reg_hdl\n")); RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_read_rf_reg_hdl\n"));
@ -217,7 +217,7 @@ _func_enter_;
("-rtl8188eu_oid_rt_pro_read_rf_reg_hdl: path=%d offset=0x%02X value=0x%05X\n", ("-rtl8188eu_oid_rt_pro_read_rf_reg_hdl: path=%d offset=0x%02X value=0x%05X\n",
path, offset, value)); path, offset, value));
_func_exit_;
return status; return status;
} }
@ -232,7 +232,7 @@ int rtl8188eu_oid_rt_pro_set_data_rate_hdl(struct oid_par_priv *poid_par_priv)
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
RT_TRACE(_module_mp_, _drv_notice_, RT_TRACE(_module_mp_, _drv_notice_,
("+rtl8188eu_oid_rt_pro_set_data_rate_hdl\n")); ("+rtl8188eu_oid_rt_pro_set_data_rate_hdl\n"));
@ -255,7 +255,7 @@ _func_enter_;
SetDataRate(Adapter); SetDataRate(Adapter);
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
_func_exit_;
return status; return status;
} }
@ -266,7 +266,7 @@ int rtl8188eu_oid_rt_pro_start_test_hdl(struct oid_par_priv *poid_par_priv)
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_start_test_hdl\n")); RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_start_test_hdl\n"));
@ -293,7 +293,7 @@ exit:
RT_TRACE(_module_mp_, _drv_notice_, ("-rtl8188eu_oid_rt_pro_start_test_hdl: mp_mode=%d\n", Adapter->mppriv.mode)); RT_TRACE(_module_mp_, _drv_notice_, ("-rtl8188eu_oid_rt_pro_start_test_hdl: mp_mode=%d\n", Adapter->mppriv.mode));
_func_exit_;
return status; return status;
} }
@ -303,7 +303,7 @@ int rtl8188eu_oid_rt_pro_stop_test_hdl(struct oid_par_priv *poid_par_priv)
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
RT_TRACE(_module_mp_, _drv_notice_, ("+Set OID_RT_PRO_STOP_TEST\n")); RT_TRACE(_module_mp_, _drv_notice_, ("+Set OID_RT_PRO_STOP_TEST\n"));
@ -316,7 +316,7 @@ _func_enter_;
RT_TRACE(_module_mp_, _drv_notice_, ("-Set OID_RT_PRO_STOP_TEST\n")); RT_TRACE(_module_mp_, _drv_notice_, ("-Set OID_RT_PRO_STOP_TEST\n"));
_func_exit_;
return status; return status;
} }
@ -327,7 +327,7 @@ int rtl8188eu_oid_rt_pro_set_channel_direct_call_hdl(struct oid_par_priv *poid_p
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_set_channel_direct_call_hdl\n")); RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_set_channel_direct_call_hdl\n"));
@ -352,7 +352,7 @@ _func_enter_;
SetChannel(Adapter); SetChannel(Adapter);
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
_func_exit_;
return status; return status;
} }
@ -364,7 +364,7 @@ int rtl8188eu_oid_rt_set_bandwidth_hdl(struct oid_par_priv *poid_par_priv)
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *padapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *padapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
RT_TRACE(_module_mp_, _drv_info_, RT_TRACE(_module_mp_, _drv_info_,
("+rtl8188eu_oid_rt_set_bandwidth_hdl\n")); ("+rtl8188eu_oid_rt_set_bandwidth_hdl\n"));
@ -391,7 +391,7 @@ _func_enter_;
("-rtl8188eu_oid_rt_set_bandwidth_hdl: bandwidth=%d channel_offset=%d\n", ("-rtl8188eu_oid_rt_set_bandwidth_hdl: bandwidth=%d channel_offset=%d\n",
bandwidth, channel_offset)); bandwidth, channel_offset));
_func_exit_;
return status; return status;
} }
@ -402,7 +402,7 @@ int rtl8188eu_oid_rt_pro_set_antenna_bb_hdl(struct oid_par_priv *poid_par_priv)
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_set_antenna_bb_hdl\n")); RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_set_antenna_bb_hdl\n"));
@ -426,7 +426,7 @@ _func_enter_;
*(u32 *)poid_par_priv->information_buf = antenna; *(u32 *)poid_par_priv->information_buf = antenna;
} }
_func_exit_;
return status; return status;
} }
@ -437,7 +437,7 @@ int rtl8188eu_oid_rt_pro_set_tx_power_control_hdl(struct oid_par_priv *poid_par_
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
RT_TRACE(_module_mp_, _drv_info_, ("+rtl8188eu_oid_rt_pro_set_tx_power_control_hdl\n")); RT_TRACE(_module_mp_, _drv_info_, ("+rtl8188eu_oid_rt_pro_set_tx_power_control_hdl\n"));
@ -461,7 +461,7 @@ _func_enter_;
SetTxPower(Adapter); SetTxPower(Adapter);
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
_func_exit_;
return status; return status;
} }
@ -474,7 +474,7 @@ int rtl8188eu_oid_rt_pro_query_tx_packet_sent_hdl(struct oid_par_priv *poid_par_
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
if (poid_par_priv->type_of_oid != QUERY_OID) { if (poid_par_priv->type_of_oid != QUERY_OID) {
status = NDIS_STATUS_NOT_ACCEPTED; status = NDIS_STATUS_NOT_ACCEPTED;
@ -488,7 +488,7 @@ _func_enter_;
status = NDIS_STATUS_INVALID_LENGTH; status = NDIS_STATUS_INVALID_LENGTH;
} }
_func_exit_;
return status; return status;
} }
@ -498,7 +498,7 @@ int rtl8188eu_oid_rt_pro_query_rx_packet_received_hdl(struct oid_par_priv *poid_
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
if (poid_par_priv->type_of_oid != QUERY_OID) { if (poid_par_priv->type_of_oid != QUERY_OID) {
status = NDIS_STATUS_NOT_ACCEPTED; status = NDIS_STATUS_NOT_ACCEPTED;
@ -513,7 +513,7 @@ _func_enter_;
status = NDIS_STATUS_INVALID_LENGTH; status = NDIS_STATUS_INVALID_LENGTH;
} }
_func_exit_;
return status; return status;
} }
@ -523,7 +523,7 @@ int rtl8188eu_oid_rt_pro_query_rx_packet_crc32_error_hdl(struct oid_par_priv *po
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
if (poid_par_priv->type_of_oid != QUERY_OID) { if (poid_par_priv->type_of_oid != QUERY_OID) {
status = NDIS_STATUS_NOT_ACCEPTED; status = NDIS_STATUS_NOT_ACCEPTED;
@ -538,7 +538,7 @@ _func_enter_;
status = NDIS_STATUS_INVALID_LENGTH; status = NDIS_STATUS_INVALID_LENGTH;
} }
_func_exit_;
return status; return status;
} }
@ -549,7 +549,7 @@ int rtl8188eu_oid_rt_pro_reset_tx_packet_sent_hdl(struct oid_par_priv *poid_par_
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
if (poid_par_priv->type_of_oid != SET_OID) { if (poid_par_priv->type_of_oid != SET_OID) {
status = NDIS_STATUS_NOT_ACCEPTED; status = NDIS_STATUS_NOT_ACCEPTED;
@ -559,7 +559,7 @@ _func_enter_;
RT_TRACE(_module_mp_, _drv_alert_, ("===> rtl8188eu_oid_rt_pro_reset_tx_packet_sent_hdl.\n")); RT_TRACE(_module_mp_, _drv_alert_, ("===> rtl8188eu_oid_rt_pro_reset_tx_packet_sent_hdl.\n"));
Adapter->mppriv.tx_pktcount = 0; Adapter->mppriv.tx_pktcount = 0;
_func_exit_;
return status; return status;
} }
@ -569,7 +569,7 @@ int rtl8188eu_oid_rt_pro_reset_rx_packet_received_hdl(struct oid_par_priv *poid_
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
if (poid_par_priv->type_of_oid != SET_OID) { if (poid_par_priv->type_of_oid != SET_OID) {
status = NDIS_STATUS_NOT_ACCEPTED; status = NDIS_STATUS_NOT_ACCEPTED;
@ -583,7 +583,7 @@ _func_enter_;
status = NDIS_STATUS_INVALID_LENGTH; status = NDIS_STATUS_INVALID_LENGTH;
} }
_func_exit_;
return status; return status;
} }
@ -593,7 +593,7 @@ int rtl8188eu_oid_rt_reset_phy_rx_packet_count_hdl(struct oid_par_priv *poid_par
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
if (poid_par_priv->type_of_oid != SET_OID) { if (poid_par_priv->type_of_oid != SET_OID) {
status = NDIS_STATUS_NOT_ACCEPTED; status = NDIS_STATUS_NOT_ACCEPTED;
@ -604,7 +604,7 @@ _func_enter_;
ResetPhyRxPktCount(Adapter); ResetPhyRxPktCount(Adapter);
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
_func_exit_;
return status; return status;
} }
@ -614,7 +614,7 @@ int rtl8188eu_oid_rt_get_phy_rx_packet_received_hdl(struct oid_par_priv *poid_pa
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
RT_TRACE(_module_mp_, _drv_info_, ("+rtl8188eu_oid_rt_get_phy_rx_packet_received_hdl\n")); RT_TRACE(_module_mp_, _drv_info_, ("+rtl8188eu_oid_rt_get_phy_rx_packet_received_hdl\n"));
@ -632,7 +632,7 @@ _func_enter_;
RT_TRACE(_module_mp_, _drv_notice_, ("-rtl8188eu_oid_rt_get_phy_rx_packet_received_hdl: recv_ok=%d\n", *(u32 *)poid_par_priv->information_buf)); RT_TRACE(_module_mp_, _drv_notice_, ("-rtl8188eu_oid_rt_get_phy_rx_packet_received_hdl: recv_ok=%d\n", *(u32 *)poid_par_priv->information_buf));
_func_exit_;
return status; return status;
} }
@ -642,7 +642,7 @@ int rtl8188eu_oid_rt_get_phy_rx_packet_crc32_error_hdl(struct oid_par_priv *poid
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
RT_TRACE(_module_mp_, _drv_info_, ("+rtl8188eu_oid_rt_get_phy_rx_packet_crc32_error_hdl\n")); RT_TRACE(_module_mp_, _drv_info_, ("+rtl8188eu_oid_rt_get_phy_rx_packet_crc32_error_hdl\n"));
@ -663,7 +663,7 @@ _func_enter_;
("-rtl8188eu_oid_rt_get_phy_rx_packet_crc32_error_hdl: recv_err =%d\n", ("-rtl8188eu_oid_rt_get_phy_rx_packet_crc32_error_hdl: recv_err =%d\n",
*(u32 *)poid_par_priv->information_buf)); *(u32 *)poid_par_priv->information_buf));
_func_exit_;
return status; return status;
} }
@ -674,7 +674,7 @@ int rtl8188eu_oid_rt_pro_set_continuous_tx_hdl(struct oid_par_priv *poid_par_pri
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_set_continuous_tx_hdl\n")); RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_set_continuous_tx_hdl\n"));
@ -698,7 +698,7 @@ _func_enter_;
} }
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
_func_exit_;
return status; return status;
} }
@ -709,7 +709,7 @@ int rtl8188eu_oid_rt_pro_set_single_carrier_tx_hdl(struct oid_par_priv *poid_par
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
RT_TRACE(_module_mp_, _drv_alert_, ("+rtl8188eu_oid_rt_pro_set_single_carrier_tx_hdl\n")); RT_TRACE(_module_mp_, _drv_alert_, ("+rtl8188eu_oid_rt_pro_set_single_carrier_tx_hdl\n"));
@ -733,7 +733,7 @@ _func_enter_;
} }
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
_func_exit_;
return status; return status;
} }
@ -744,7 +744,7 @@ int rtl8188eu_oid_rt_pro_set_carrier_suppression_tx_hdl(struct oid_par_priv *poi
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_set_carrier_suppression_tx_hdl\n")); RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_set_carrier_suppression_tx_hdl\n"));
@ -768,7 +768,7 @@ _func_enter_;
} }
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
_func_exit_;
return status; return status;
} }
@ -779,7 +779,7 @@ int rtl8188eu_oid_rt_pro_set_single_tone_tx_hdl(struct oid_par_priv *poid_par_pr
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
RT_TRACE(_module_mp_, _drv_alert_, ("+rtl8188eu_oid_rt_pro_set_single_tone_tx_hdl\n")); RT_TRACE(_module_mp_, _drv_alert_, ("+rtl8188eu_oid_rt_pro_set_single_tone_tx_hdl\n"));
@ -792,7 +792,7 @@ _func_enter_;
SetSingleToneTx(Adapter, (u8)bStartTest); SetSingleToneTx(Adapter, (u8)bStartTest);
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
_func_exit_;
return status; return status;
} }
@ -806,7 +806,7 @@ int rtl8188eu_oid_rt_pro_trigger_gpio_hdl(struct oid_par_priv *poid_par_priv)
{ {
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
_func_enter_;
if (poid_par_priv->type_of_oid != SET_OID) if (poid_par_priv->type_of_oid != SET_OID)
return NDIS_STATUS_NOT_ACCEPTED; return NDIS_STATUS_NOT_ACCEPTED;
@ -815,7 +815,7 @@ _func_enter_;
rtw_hal_set_hwreg(Adapter, HW_VAR_TRIGGER_GPIO_0, NULL); rtw_hal_set_hwreg(Adapter, HW_VAR_TRIGGER_GPIO_0, NULL);
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
_func_exit_;
return status; return status;
} }
@ -833,7 +833,7 @@ int rtl8188eu_oid_rt_pro_read_register_hdl(struct oid_par_priv *poid_par_priv)
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
RT_TRACE(_module_mp_, _drv_info_, RT_TRACE(_module_mp_, _drv_info_,
("+rtl8188eu_oid_rt_pro_read_register_hdl\n")); ("+rtl8188eu_oid_rt_pro_read_register_hdl\n"));
@ -870,7 +870,7 @@ _func_enter_;
*poid_par_priv->bytes_rw = width; *poid_par_priv->bytes_rw = width;
_func_exit_;
return status; return status;
} }
@ -882,7 +882,7 @@ int rtl8188eu_oid_rt_pro_write_register_hdl(struct oid_par_priv *poid_par_priv)
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *padapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *padapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
RT_TRACE(_module_mp_, _drv_info_, RT_TRACE(_module_mp_, _drv_info_,
("+rtl8188eu_oid_rt_pro_write_register_hdl\n")); ("+rtl8188eu_oid_rt_pro_write_register_hdl\n"));
@ -929,7 +929,7 @@ _func_enter_;
("-rtl8188eu_oid_rt_pro_write_register_hdl: offset=0x%08X width=%d value=0x%X\n", ("-rtl8188eu_oid_rt_pro_write_register_hdl: offset=0x%08X width=%d value=0x%X\n",
offset, width, value)); offset, width, value));
_func_exit_;
return status; return status;
} }
@ -1002,7 +1002,7 @@ int rtl8188eu_oid_rt_pro_set_data_rate_ex_hdl(struct oid_par_priv *poid_par_priv
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
_func_enter_;
RT_TRACE(_module_mp_, _drv_notice_, ("+OID_RT_PRO_SET_DATA_RATE_EX\n")); RT_TRACE(_module_mp_, _drv_notice_, ("+OID_RT_PRO_SET_DATA_RATE_EX\n"));
@ -1016,7 +1016,7 @@ _func_enter_;
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
_func_exit_;
return status; return status;
} }
@ -1027,7 +1027,7 @@ int rtl8188eu_oid_rt_get_thermal_meter_hdl(struct oid_par_priv *poid_par_priv)
u8 thermal = 0; u8 thermal = 0;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_get_thermal_meter_hdl\n")); RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_get_thermal_meter_hdl\n"));
@ -1044,7 +1044,7 @@ _func_enter_;
*(u32 *)poid_par_priv->information_buf = (u32)thermal; *(u32 *)poid_par_priv->information_buf = (u32)thermal;
*poid_par_priv->bytes_rw = sizeof(u32); *poid_par_priv->bytes_rw = sizeof(u32);
_func_exit_;
return status; return status;
} }
@ -1060,7 +1060,7 @@ int rtl8188eu_oid_rt_pro_set_power_tracking_hdl(struct oid_par_priv *poid_par_pr
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
if (poid_par_priv->information_buf_len < sizeof(u8)) if (poid_par_priv->information_buf_len < sizeof(u8))
return NDIS_STATUS_INVALID_LENGTH; return NDIS_STATUS_INVALID_LENGTH;
@ -1079,7 +1079,7 @@ _func_enter_;
} }
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
_func_exit_;
return status; return status;
} }
@ -1143,7 +1143,7 @@ int rtl8188eu_oid_rt_pro_read_efuse_hdl(struct oid_par_priv *poid_par_priv)
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
if (poid_par_priv->type_of_oid != QUERY_OID) if (poid_par_priv->type_of_oid != QUERY_OID)
return NDIS_STATUS_NOT_ACCEPTED; return NDIS_STATUS_NOT_ACCEPTED;
@ -1176,7 +1176,7 @@ _func_enter_;
} }
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
_func_exit_;
return status; return status;
} }
@ -1190,7 +1190,7 @@ int rtl8188eu_oid_rt_pro_write_efuse_hdl(struct oid_par_priv *poid_par_priv)
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
if (poid_par_priv->type_of_oid != SET_OID) if (poid_par_priv->type_of_oid != SET_OID)
return NDIS_STATUS_NOT_ACCEPTED; return NDIS_STATUS_NOT_ACCEPTED;
@ -1216,7 +1216,7 @@ _func_enter_;
status = NDIS_STATUS_FAILURE; status = NDIS_STATUS_FAILURE;
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
_func_exit_;
return status; return status;
} }
@ -1227,7 +1227,7 @@ int rtl8188eu_oid_rt_pro_rw_efuse_pgpkt_hdl(struct oid_par_priv *poid_par_priv)
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
*poid_par_priv->bytes_rw = 0; *poid_par_priv->bytes_rw = 0;
@ -1267,7 +1267,7 @@ _func_enter_;
RT_TRACE(_module_mp_, _drv_info_, RT_TRACE(_module_mp_, _drv_info_,
("-rtl8188eu_oid_rt_pro_rw_efuse_pgpkt_hdl: status=0x%08X\n", status)); ("-rtl8188eu_oid_rt_pro_rw_efuse_pgpkt_hdl: status=0x%08X\n", status));
_func_exit_;
return status; return status;
} }
@ -1279,7 +1279,7 @@ int rtl8188eu_oid_rt_get_efuse_current_size_hdl(struct oid_par_priv *poid_par_pr
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
if (poid_par_priv->type_of_oid != QUERY_OID) if (poid_par_priv->type_of_oid != QUERY_OID)
return NDIS_STATUS_NOT_ACCEPTED; return NDIS_STATUS_NOT_ACCEPTED;
@ -1296,7 +1296,7 @@ _func_enter_;
} else { } else {
status = NDIS_STATUS_FAILURE; status = NDIS_STATUS_FAILURE;
} }
_func_exit_;
return status; return status;
} }
@ -1306,7 +1306,7 @@ int rtl8188eu_oid_rt_get_efuse_max_size_hdl(struct oid_par_priv *poid_par_priv)
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
if (poid_par_priv->type_of_oid != QUERY_OID) if (poid_par_priv->type_of_oid != QUERY_OID)
return NDIS_STATUS_NOT_ACCEPTED; return NDIS_STATUS_NOT_ACCEPTED;
@ -1321,7 +1321,7 @@ _func_enter_;
("-rtl8188eu_oid_rt_get_efuse_max_size_hdl: size=%d status=0x%08X\n", ("-rtl8188eu_oid_rt_get_efuse_max_size_hdl: size=%d status=0x%08X\n",
*(int *)poid_par_priv->information_buf, status)); *(int *)poid_par_priv->information_buf, status));
_func_exit_;
return status; return status;
} }
@ -1330,7 +1330,7 @@ int rtl8188eu_oid_rt_pro_efuse_hdl(struct oid_par_priv *poid_par_priv)
{ {
int status; int status;
_func_enter_;
RT_TRACE(_module_mp_, _drv_info_, ("+rtl8188eu_oid_rt_pro_efuse_hdl\n")); RT_TRACE(_module_mp_, _drv_info_, ("+rtl8188eu_oid_rt_pro_efuse_hdl\n"));
@ -1341,7 +1341,7 @@ _func_enter_;
RT_TRACE(_module_mp_, _drv_info_, ("-rtl8188eu_oid_rt_pro_efuse_hdl: status=0x%08X\n", status)); RT_TRACE(_module_mp_, _drv_info_, ("-rtl8188eu_oid_rt_pro_efuse_hdl: status=0x%08X\n", status));
_func_exit_;
return status; return status;
} }
@ -1353,7 +1353,7 @@ int rtl8188eu_oid_rt_pro_efuse_map_hdl(struct oid_par_priv *poid_par_priv)
struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context); struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);
u16 maplen = 0; u16 maplen = 0;
_func_enter_;
RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_efuse_map_hdl\n")); RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_efuse_map_hdl\n"));
@ -1398,7 +1398,7 @@ _func_enter_;
RT_TRACE(_module_mp_, _drv_info_, RT_TRACE(_module_mp_, _drv_info_,
("-rtl8188eu_oid_rt_pro_efuse_map_hdl: status=0x%08X\n", status)); ("-rtl8188eu_oid_rt_pro_efuse_map_hdl: status=0x%08X\n", status));
_func_exit_;
return status; return status;
} }
@ -1414,7 +1414,7 @@ int rtl8188eu_oid_rt_set_rx_packet_type_hdl(struct oid_par_priv *poid_par_priv)
u8 rx_pkt_type; u8 rx_pkt_type;
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
_func_enter_;
RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_set_rx_packet_type_hdl\n")); RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_set_rx_packet_type_hdl\n"));
@ -1427,7 +1427,7 @@ _func_enter_;
rx_pkt_type = *((u8 *)poid_par_priv->information_buf);/* 4 */ rx_pkt_type = *((u8 *)poid_par_priv->information_buf);/* 4 */
RT_TRACE(_module_mp_, _drv_info_, ("rx_pkt_type: %x\n", rx_pkt_type)); RT_TRACE(_module_mp_, _drv_info_, ("rx_pkt_type: %x\n", rx_pkt_type));
_func_exit_;
return status; return status;
} }
@ -1482,7 +1482,7 @@ int rtl8188eu_oid_rt_set_power_down_hdl(struct oid_par_priv *poid_par_priv)
{ {
int status = NDIS_STATUS_SUCCESS; int status = NDIS_STATUS_SUCCESS;
_func_enter_;
if (poid_par_priv->type_of_oid != SET_OID) { if (poid_par_priv->type_of_oid != SET_OID) {
status = NDIS_STATUS_NOT_ACCEPTED; status = NDIS_STATUS_NOT_ACCEPTED;
@ -1497,7 +1497,7 @@ _func_enter_;
/* CALL the power_down function */ /* CALL the power_down function */
_irqlevel_changed_(&oldirql, RAISE); _irqlevel_changed_(&oldirql, RAISE);
_func_exit_;
return status; return status;
} }

36
core/rtw_p2p.c
View file

@ -1498,7 +1498,7 @@ static void find_phase_handler(struct adapter *padapter)
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct ndis_802_11_ssid ssid; struct ndis_802_11_ssid ssid;
_func_enter_;
_rtw_memset((unsigned char *)&ssid, 0, sizeof(struct ndis_802_11_ssid)); _rtw_memset((unsigned char *)&ssid, 0, sizeof(struct ndis_802_11_ssid));
memcpy(ssid.Ssid, pwdinfo->p2p_wildcard_ssid, P2P_WILDCARD_SSID_LEN); memcpy(ssid.Ssid, pwdinfo->p2p_wildcard_ssid, P2P_WILDCARD_SSID_LEN);
@ -1510,7 +1510,7 @@ _func_enter_;
spin_unlock_bh(&pmlmepriv->lock); spin_unlock_bh(&pmlmepriv->lock);
_func_exit_;
} }
void p2p_concurrent_handler(struct adapter *padapter); void p2p_concurrent_handler(struct adapter *padapter);
@ -1519,7 +1519,7 @@ static void restore_p2p_state_handler(struct adapter *padapter)
{ {
struct wifidirect_info *pwdinfo = &padapter->wdinfo; struct wifidirect_info *pwdinfo = &padapter->wdinfo;
_func_enter_;
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_ING) || rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_FAIL)) if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_ING) || rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_FAIL))
rtw_p2p_set_role(pwdinfo, P2P_ROLE_DEVICE); rtw_p2p_set_role(pwdinfo, P2P_ROLE_DEVICE);
rtw_p2p_set_state(pwdinfo, rtw_p2p_pre_state(pwdinfo)); rtw_p2p_set_state(pwdinfo, rtw_p2p_pre_state(pwdinfo));
@ -1529,54 +1529,54 @@ _func_enter_;
/* because this P2P client should stay at the operating channel of P2P GO. */ /* because this P2P client should stay at the operating channel of P2P GO. */
set_channel_bwmode(padapter, pwdinfo->listen_channel, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); set_channel_bwmode(padapter, pwdinfo->listen_channel, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20);
} }
_func_exit_;
} }
static void pre_tx_invitereq_handler(struct adapter *padapter) static void pre_tx_invitereq_handler(struct adapter *padapter)
{ {
struct wifidirect_info *pwdinfo = &padapter->wdinfo; struct wifidirect_info *pwdinfo = &padapter->wdinfo;
u8 val8 = 1; u8 val8 = 1;
_func_enter_;
set_channel_bwmode(padapter, pwdinfo->invitereq_info.peer_ch, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); set_channel_bwmode(padapter, pwdinfo->invitereq_info.peer_ch, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20);
padapter->HalFunc.SetHwRegHandler(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8)); padapter->HalFunc.SetHwRegHandler(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8));
issue_probereq_p2p(padapter, NULL); issue_probereq_p2p(padapter, NULL);
_set_timer(&pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT); _set_timer(&pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT);
_func_exit_;
} }
static void pre_tx_provdisc_handler(struct adapter *padapter) static void pre_tx_provdisc_handler(struct adapter *padapter)
{ {
struct wifidirect_info *pwdinfo = &padapter->wdinfo; struct wifidirect_info *pwdinfo = &padapter->wdinfo;
u8 val8 = 1; u8 val8 = 1;
_func_enter_;
set_channel_bwmode(padapter, pwdinfo->tx_prov_disc_info.peer_channel_num[0], HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); set_channel_bwmode(padapter, pwdinfo->tx_prov_disc_info.peer_channel_num[0], HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20);
rtw_hal_set_hwreg(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8)); rtw_hal_set_hwreg(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8));
issue_probereq_p2p(padapter, NULL); issue_probereq_p2p(padapter, NULL);
_set_timer(&pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT); _set_timer(&pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT);
_func_exit_;
} }
static void pre_tx_negoreq_handler(struct adapter *padapter) static void pre_tx_negoreq_handler(struct adapter *padapter)
{ {
struct wifidirect_info *pwdinfo = &padapter->wdinfo; struct wifidirect_info *pwdinfo = &padapter->wdinfo;
u8 val8 = 1; u8 val8 = 1;
_func_enter_;
set_channel_bwmode(padapter, pwdinfo->nego_req_info.peer_channel_num[0], HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); set_channel_bwmode(padapter, pwdinfo->nego_req_info.peer_channel_num[0], HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20);
rtw_hal_set_hwreg(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8)); rtw_hal_set_hwreg(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8));
issue_probereq_p2p(padapter, NULL); issue_probereq_p2p(padapter, NULL);
_set_timer(&pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT); _set_timer(&pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT);
_func_exit_;
} }
void p2p_protocol_wk_hdl(struct adapter *padapter, int intCmdType) void p2p_protocol_wk_hdl(struct adapter *padapter, int intCmdType)
{ {
_func_enter_;
switch (intCmdType) { switch (intCmdType) {
case P2P_FIND_PHASE_WK: case P2P_FIND_PHASE_WK:
find_phase_handler(padapter); find_phase_handler(padapter);
@ -1595,7 +1595,7 @@ _func_enter_;
break; break;
} }
_func_exit_;
} }
void process_p2p_ps_ie(struct adapter *padapter, u8 *IEs, u32 IELength) void process_p2p_ps_ie(struct adapter *padapter, u8 *IEs, u32 IELength)
@ -1611,7 +1611,7 @@ void process_p2p_ps_ie(struct adapter *padapter, u8 *IEs, u32 IELength)
u8 find_p2p = false, find_p2p_ps = false; u8 find_p2p = false, find_p2p_ps = false;
u8 noa_offset, noa_num, noa_index; u8 noa_offset, noa_num, noa_index;
_func_enter_;
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
return; return;
@ -1684,7 +1684,7 @@ _func_enter_;
p2p_ps_wk_cmd(padapter, P2P_PS_DISABLE, 1); p2p_ps_wk_cmd(padapter, P2P_PS_DISABLE, 1);
} }
_func_exit_;
} }
void p2p_ps_wk_hdl(struct adapter *padapter, u8 p2p_ps_state) void p2p_ps_wk_hdl(struct adapter *padapter, u8 p2p_ps_state)
@ -1692,7 +1692,7 @@ void p2p_ps_wk_hdl(struct adapter *padapter, u8 p2p_ps_state)
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
struct wifidirect_info *pwdinfo = &(padapter->wdinfo); struct wifidirect_info *pwdinfo = &(padapter->wdinfo);
_func_enter_;
/* Pre action for p2p state */ /* Pre action for p2p state */
switch (p2p_ps_state) { switch (p2p_ps_state) {
@ -1739,7 +1739,7 @@ _func_enter_;
break; break;
} }
_func_exit_;
} }
u8 p2p_ps_wk_cmd(struct adapter *padapter, u8 p2p_ps_state, u8 enqueue) u8 p2p_ps_wk_cmd(struct adapter *padapter, u8 p2p_ps_state, u8 enqueue)
@ -1750,7 +1750,7 @@ u8 p2p_ps_wk_cmd(struct adapter *padapter, u8 p2p_ps_state, u8 enqueue)
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
u8 res = _SUCCESS; u8 res = _SUCCESS;
_func_enter_;
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
return res; return res;
@ -1782,7 +1782,7 @@ _func_enter_;
exit: exit:
_func_exit_;
return res; return res;
} }

28
core/rtw_pwrctrl.c
View file

@ -227,7 +227,7 @@ void rtw_set_rpwm(struct adapter *padapter, u8 pslv)
u8 rpwm; u8 rpwm;
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
_func_enter_;
pslv = PS_STATE(pslv); pslv = PS_STATE(pslv);
@ -276,7 +276,7 @@ _func_enter_;
pwrpriv->tog += 0x80; pwrpriv->tog += 0x80;
pwrpriv->cpwm = pslv; pwrpriv->cpwm = pslv;
_func_exit_;
} }
static u8 PS_RDY_CHECK(struct adapter *padapter) static u8 PS_RDY_CHECK(struct adapter *padapter)
@ -314,7 +314,7 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 bcn_a
struct wifidirect_info *pwdinfo = &(padapter->wdinfo); struct wifidirect_info *pwdinfo = &(padapter->wdinfo);
#endif /* CONFIG_88EU_P2P */ #endif /* CONFIG_88EU_P2P */
_func_enter_;
RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_, RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_,
("%s: PowerMode=%d Smart_PS=%d\n", ("%s: PowerMode=%d Smart_PS=%d\n",
@ -364,7 +364,7 @@ _func_enter_;
} }
} }
_func_exit_;
} }
/* /*
@ -411,7 +411,7 @@ void LPS_Enter(struct adapter *padapter)
{ {
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
_func_enter_;
if (PS_RDY_CHECK(padapter) == false) if (PS_RDY_CHECK(padapter) == false)
return; return;
@ -431,7 +431,7 @@ _func_enter_;
} }
} }
_func_exit_;
} }
#define LPS_LEAVE_TIMEOUT_MS 100 #define LPS_LEAVE_TIMEOUT_MS 100
@ -442,7 +442,7 @@ void LPS_Leave(struct adapter *padapter)
{ {
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
_func_enter_;
if (pwrpriv->bLeisurePs) { if (pwrpriv->bLeisurePs) {
if (pwrpriv->pwr_mode != PS_MODE_ACTIVE) { if (pwrpriv->pwr_mode != PS_MODE_ACTIVE) {
@ -455,7 +455,7 @@ _func_enter_;
pwrpriv->bpower_saving = false; pwrpriv->bpower_saving = false;
_func_exit_;
} }
/* */ /* */
@ -467,7 +467,7 @@ void LeaveAllPowerSaveMode(struct adapter *Adapter)
struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv);
u8 enqueue = 0; u8 enqueue = 0;
_func_enter_;
if (check_fwstate(pmlmepriv, _FW_LINKED)) { /* connect */ if (check_fwstate(pmlmepriv, _FW_LINKED)) { /* connect */
p2p_ps_wk_cmd(Adapter, P2P_PS_DISABLE, enqueue); p2p_ps_wk_cmd(Adapter, P2P_PS_DISABLE, enqueue);
@ -475,14 +475,14 @@ _func_enter_;
rtw_lps_ctrl_wk_cmd(Adapter, LPS_CTRL_LEAVE, enqueue); rtw_lps_ctrl_wk_cmd(Adapter, LPS_CTRL_LEAVE, enqueue);
} }
_func_exit_;
} }
void rtw_init_pwrctrl_priv(struct adapter *padapter) void rtw_init_pwrctrl_priv(struct adapter *padapter)
{ {
struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv;
_func_enter_;
_init_pwrlock(&pwrctrlpriv->lock); _init_pwrlock(&pwrctrlpriv->lock);
pwrctrlpriv->rf_pwrstate = rf_on; pwrctrlpriv->rf_pwrstate = rf_on;
@ -521,18 +521,18 @@ _func_enter_;
_init_timer(&(pwrctrlpriv->pwr_state_check_timer), padapter->pnetdev, pwr_state_check_handler, (u8 *)padapter); _init_timer(&(pwrctrlpriv->pwr_state_check_timer), padapter->pnetdev, pwr_state_check_handler, (u8 *)padapter);
_func_exit_;
} }
void rtw_free_pwrctrl_priv(struct adapter *adapter) void rtw_free_pwrctrl_priv(struct adapter *adapter)
{ {
struct pwrctrl_priv *pwrctrlpriv = &adapter->pwrctrlpriv; struct pwrctrl_priv *pwrctrlpriv = &adapter->pwrctrlpriv;
_func_enter_;
_free_pwrlock(&pwrctrlpriv->lock); _free_pwrlock(&pwrctrlpriv->lock);
_func_exit_;
} }
u8 rtw_interface_ps_func(struct adapter *padapter, enum hal_intf_ps_func efunc_id, u8 *val) u8 rtw_interface_ps_func(struct adapter *padapter, enum hal_intf_ps_func efunc_id, u8 *val)

82
core/rtw_recv.c
View file

@ -45,7 +45,7 @@ void rtw_signal_stat_timer_hdl(RTW_TIMER_HDL_ARGS);
void _rtw_init_sta_recv_priv(struct sta_recv_priv *psta_recvpriv) void _rtw_init_sta_recv_priv(struct sta_recv_priv *psta_recvpriv)
{ {
_func_enter_;
_rtw_memset((u8 *)psta_recvpriv, 0, sizeof (struct sta_recv_priv)); _rtw_memset((u8 *)psta_recvpriv, 0, sizeof (struct sta_recv_priv));
@ -53,7 +53,7 @@ _func_enter_;
_rtw_init_queue(&psta_recvpriv->defrag_q); _rtw_init_queue(&psta_recvpriv->defrag_q);
_func_exit_;
} }
int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter) int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)
@ -64,7 +64,7 @@ int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)
int res = _SUCCESS; int res = _SUCCESS;
_func_enter_;
spin_lock_init(&precvpriv->lock); spin_lock_init(&precvpriv->lock);
_rtw_init_queue(&precvpriv->free_recv_queue); _rtw_init_queue(&precvpriv->free_recv_queue);
@ -113,7 +113,7 @@ _func_enter_;
rtw_set_signal_stat_timer(precvpriv); rtw_set_signal_stat_timer(precvpriv);
exit: exit:
_func_exit_;
return res; return res;
} }
@ -131,7 +131,7 @@ void _rtw_free_recv_priv (struct recv_priv *precvpriv)
{ {
struct adapter *padapter = precvpriv->adapter; struct adapter *padapter = precvpriv->adapter;
_func_enter_;
rtw_free_uc_swdec_pending_queue(padapter); rtw_free_uc_swdec_pending_queue(padapter);
@ -145,7 +145,7 @@ _func_enter_;
rtw_hal_free_recv_priv(padapter); rtw_hal_free_recv_priv(padapter);
_func_exit_;
} }
union recv_frame *_rtw_alloc_recvframe (struct __queue *pfree_recv_queue) union recv_frame *_rtw_alloc_recvframe (struct __queue *pfree_recv_queue)
@ -154,7 +154,7 @@ union recv_frame *_rtw_alloc_recvframe (struct __queue *pfree_recv_queue)
struct list_head *plist, *phead; struct list_head *plist, *phead;
struct adapter *padapter; struct adapter *padapter;
struct recv_priv *precvpriv; struct recv_priv *precvpriv;
_func_enter_;
if (_rtw_queue_empty(pfree_recv_queue)) { if (_rtw_queue_empty(pfree_recv_queue)) {
precvframe = NULL; precvframe = NULL;
@ -174,7 +174,7 @@ _func_enter_;
} }
} }
_func_exit_;
return precvframe; return precvframe;
} }
@ -205,7 +205,7 @@ int rtw_free_recvframe(union recv_frame *precvframe, struct __queue *pfree_recv_
struct adapter *padapter; struct adapter *padapter;
struct recv_priv *precvpriv; struct recv_priv *precvpriv;
_func_enter_;
if (!precvframe) if (!precvframe)
return _FAIL; return _FAIL;
padapter = precvframe->u.hdr.adapter; padapter = precvframe->u.hdr.adapter;
@ -230,7 +230,7 @@ _func_enter_;
spin_unlock_bh(&pfree_recv_queue->lock); spin_unlock_bh(&pfree_recv_queue->lock);
_func_exit_;
return _SUCCESS; return _SUCCESS;
} }
@ -240,7 +240,7 @@ int _rtw_enqueue_recvframe(union recv_frame *precvframe, struct __queue *queue)
struct adapter *padapter = precvframe->u.hdr.adapter; struct adapter *padapter = precvframe->u.hdr.adapter;
struct recv_priv *precvpriv = &padapter->recvpriv; struct recv_priv *precvpriv = &padapter->recvpriv;
_func_enter_;
rtw_list_delete(&(precvframe->u.hdr.list)); rtw_list_delete(&(precvframe->u.hdr.list));
rtw_list_insert_tail(&(precvframe->u.hdr.list), get_list_head(queue)); rtw_list_insert_tail(&(precvframe->u.hdr.list), get_list_head(queue));
@ -250,7 +250,7 @@ _func_enter_;
precvpriv->free_recvframe_cnt++; precvpriv->free_recvframe_cnt++;
} }
_func_exit_;
return _SUCCESS; return _SUCCESS;
} }
@ -279,7 +279,7 @@ void rtw_free_recvframe_queue(struct __queue *pframequeue, struct __queue *pfre
union recv_frame *precvframe; union recv_frame *precvframe;
struct list_head *plist, *phead; struct list_head *plist, *phead;
_func_enter_;
spin_lock(&pframequeue->lock); spin_lock(&pframequeue->lock);
phead = get_list_head(pframequeue); phead = get_list_head(pframequeue);
@ -295,7 +295,7 @@ _func_enter_;
spin_unlock(&pframequeue->lock); spin_unlock(&pframequeue->lock);
_func_exit_;
} }
u32 rtw_free_uc_swdec_pending_queue(struct adapter *adapter) u32 rtw_free_uc_swdec_pending_queue(struct adapter *adapter)
@ -375,7 +375,7 @@ static int recvframe_chkmic(struct adapter *adapter, union recv_frame *precvfra
struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
_func_enter_;
stainfo = rtw_get_stainfo(&adapter->stapriv, &prxattrib->ta[0]); stainfo = rtw_get_stainfo(&adapter->stapriv, &prxattrib->ta[0]);
@ -483,7 +483,7 @@ _func_enter_;
exit: exit:
_func_exit_;
return res; return res;
} }
@ -495,7 +495,7 @@ static union recv_frame *decryptor(struct adapter *padapter, union recv_frame *p
struct security_priv *psecuritypriv = &padapter->securitypriv; struct security_priv *psecuritypriv = &padapter->securitypriv;
union recv_frame *return_packet = precv_frame; union recv_frame *return_packet = precv_frame;
u32 res = _SUCCESS; u32 res = _SUCCESS;
_func_enter_;
RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("prxstat->decrypted=%x prxattrib->encrypt=0x%03x\n", prxattrib->bdecrypted, prxattrib->encrypt)); RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("prxstat->decrypted=%x prxattrib->encrypt=0x%03x\n", prxattrib->bdecrypted, prxattrib->encrypt));
@ -548,7 +548,7 @@ _func_enter_;
prxattrib->bdecrypted = true; prxattrib->bdecrypted = true;
} }
_func_exit_;
return return_packet; return return_packet;
} }
@ -567,7 +567,7 @@ static union recv_frame *portctrl(struct adapter *adapter, union recv_frame *pre
struct rx_pkt_attrib *pattrib; struct rx_pkt_attrib *pattrib;
__be16 be_tmp; __be16 be_tmp;
_func_enter_;
pstapriv = &adapter->stapriv; pstapriv = &adapter->stapriv;
@ -629,7 +629,7 @@ _func_enter_;
prtnframe = precv_frame; prtnframe = precv_frame;
} }
_func_exit_;
return prtnframe; return prtnframe;
} }
@ -641,7 +641,7 @@ static int recv_decache(union recv_frame *precv_frame, u8 bretry, struct stainfo
u16 seq_ctrl = ((precv_frame->u.hdr.attrib.seq_num&0xffff) << 4) | u16 seq_ctrl = ((precv_frame->u.hdr.attrib.seq_num&0xffff) << 4) |
(precv_frame->u.hdr.attrib.frag_num & 0xf); (precv_frame->u.hdr.attrib.frag_num & 0xf);
_func_enter_;
if (tid > 15) { if (tid > 15) {
RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, ("recv_decache, (tid>15)! seq_ctrl=0x%x, tid=0x%x\n", seq_ctrl, tid)); RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, ("recv_decache, (tid>15)! seq_ctrl=0x%x, tid=0x%x\n", seq_ctrl, tid));
@ -659,7 +659,7 @@ _func_enter_;
prxcache->tid_rxseq[tid] = seq_ctrl; prxcache->tid_rxseq[tid] = seq_ctrl;
_func_exit_;
return _SUCCESS; return _SUCCESS;
} }
@ -793,7 +793,7 @@ int sta2sta_data_frame(struct adapter *adapter, union recv_frame *precv_frame, s
u8 *sta_addr = NULL; u8 *sta_addr = NULL;
int bmcast = IS_MCAST(pattrib->dst); int bmcast = IS_MCAST(pattrib->dst);
_func_enter_;
if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true) || if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true) ||
(check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true)) { (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true)) {
@ -869,7 +869,7 @@ _func_enter_;
} }
exit: exit:
_func_exit_;
return ret; return ret;
} }
@ -887,7 +887,7 @@ static int ap2sta_data_frame (
u8 *myhwaddr = myid(&adapter->eeprompriv); u8 *myhwaddr = myid(&adapter->eeprompriv);
int bmcast = IS_MCAST(pattrib->dst); int bmcast = IS_MCAST(pattrib->dst);
_func_enter_;
if ((check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true) && if ((check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true) &&
(check_fwstate(pmlmepriv, _FW_LINKED) == true || (check_fwstate(pmlmepriv, _FW_LINKED) == true ||
@ -980,7 +980,7 @@ _func_enter_;
exit: exit:
_func_exit_;
return ret; return ret;
} }
@ -996,7 +996,7 @@ static int sta2ap_data_frame(struct adapter *adapter,
unsigned char *mybssid = get_bssid(pmlmepriv); unsigned char *mybssid = get_bssid(pmlmepriv);
int ret = _SUCCESS; int ret = _SUCCESS;
_func_enter_;
if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) { if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) {
/* For AP mode, RA = BSSID, TX = STA(SRC_ADDR), A3 = DST_ADDR */ /* For AP mode, RA = BSSID, TX = STA(SRC_ADDR), A3 = DST_ADDR */
@ -1042,7 +1042,7 @@ _func_enter_;
exit: exit:
_func_exit_;
return ret; return ret;
} }
@ -1220,7 +1220,7 @@ static int validate_recv_data_frame(struct adapter *adapter,
struct security_priv *psecuritypriv = &adapter->securitypriv; struct security_priv *psecuritypriv = &adapter->securitypriv;
int ret = _SUCCESS; int ret = _SUCCESS;
_func_enter_;
bretry = GetRetry(ptr); bretry = GetRetry(ptr);
pda = get_da(ptr); pda = get_da(ptr);
@ -1325,7 +1325,7 @@ _func_enter_;
exit: exit:
_func_exit_;
return ret; return ret;
} }
@ -1345,7 +1345,7 @@ static int validate_recv_frame(struct adapter *adapter, union recv_frame *precv_
u8 ver = (unsigned char) (*ptr)&0x3; u8 ver = (unsigned char) (*ptr)&0x3;
struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv;
_func_enter_;
if (pmlmeext->sitesurvey_res.state == SCAN_PROCESS) { if (pmlmeext->sitesurvey_res.state == SCAN_PROCESS) {
int ch_set_idx = rtw_ch_set_search_ch(pmlmeext->channel_set, rtw_get_oper_ch(adapter)); int ch_set_idx = rtw_ch_set_search_ch(pmlmeext->channel_set, rtw_get_oper_ch(adapter));
@ -1435,7 +1435,7 @@ _func_enter_;
exit: exit:
_func_exit_;
return retval; return retval;
} }
@ -1458,7 +1458,7 @@ static int wlanhdr_to_ethhdr (union recv_frame *precvframe)
u8 *ptr = get_recvframe_data(precvframe); /* point to frame_ctrl field */ u8 *ptr = get_recvframe_data(precvframe); /* point to frame_ctrl field */
struct rx_pkt_attrib *pattrib = &precvframe->u.hdr.attrib; struct rx_pkt_attrib *pattrib = &precvframe->u.hdr.attrib;
_func_enter_;
if (pattrib->encrypt) if (pattrib->encrypt)
recvframe_pull_tail(precvframe, pattrib->icv_len); recvframe_pull_tail(precvframe, pattrib->icv_len);
@ -1509,7 +1509,7 @@ _func_enter_;
memcpy(ptr+12, &be_tmp, 2); memcpy(ptr+12, &be_tmp, 2);
} }
_func_exit_;
return ret; return ret;
} }
@ -1523,7 +1523,7 @@ static union recv_frame *recvframe_defrag(struct adapter *adapter, struct __queu
union recv_frame *prframe, *pnextrframe; union recv_frame *prframe, *pnextrframe;
struct __queue *pfree_recv_queue; struct __queue *pfree_recv_queue;
_func_enter_;
curfragnum = 0; curfragnum = 0;
pfree_recv_queue = &adapter->recvpriv.free_recv_queue; pfree_recv_queue = &adapter->recvpriv.free_recv_queue;
@ -1589,7 +1589,7 @@ _func_enter_;
RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("Performance defrag!!!!!\n")); RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("Performance defrag!!!!!\n"));
_func_exit_;
return prframe; return prframe;
} }
@ -1607,7 +1607,7 @@ union recv_frame *recvframe_chk_defrag(struct adapter *padapter, union recv_fram
union recv_frame *prtnframe = NULL; union recv_frame *prtnframe = NULL;
struct __queue *pfree_recv_queue, *pdefrag_q; struct __queue *pfree_recv_queue, *pdefrag_q;
_func_enter_;
pstapriv = &padapter->stapriv; pstapriv = &padapter->stapriv;
@ -1692,7 +1692,7 @@ _func_enter_;
} }
} }
_func_exit_;
return prtnframe; return prtnframe;
} }
@ -2217,7 +2217,7 @@ s32 rtw_recv_entry(union recv_frame *precvframe)
struct recv_priv *precvpriv; struct recv_priv *precvpriv;
s32 ret = _SUCCESS; s32 ret = _SUCCESS;
_func_enter_;
padapter = precvframe->u.hdr.adapter; padapter = precvframe->u.hdr.adapter;
@ -2231,7 +2231,7 @@ _func_enter_;
precvpriv->rx_pkts++; precvpriv->rx_pkts++;
_func_exit_;
return ret; return ret;
@ -2240,7 +2240,7 @@ _recv_entry_drop:
if (padapter->registrypriv.mp_mode == 1) if (padapter->registrypriv.mp_mode == 1)
padapter->mppriv.rx_pktloss = precvpriv->rx_drop; padapter->mppriv.rx_pktloss = precvpriv->rx_drop;
_func_exit_;
return ret; return ret;
} }

145
core/rtw_security.c
View file

@ -41,7 +41,7 @@ static void arcfour_init(struct arc4context *parc4ctx, u8 *key, u32 key_len)
u32 stateindex; u32 stateindex;
u8 *state; u8 *state;
u32 counter; u32 counter;
_func_enter_;
state = parc4ctx->state; state = parc4ctx->state;
parc4ctx->x = 0; parc4ctx->x = 0;
parc4ctx->y = 0; parc4ctx->y = 0;
@ -58,7 +58,7 @@ _func_enter_;
if (++keyindex >= key_len) if (++keyindex >= key_len)
keyindex = 0; keyindex = 0;
} }
_func_exit_;
} }
static u32 arcfour_byte(struct arc4context *parc4ctx) static u32 arcfour_byte(struct arc4context *parc4ctx)
@ -67,7 +67,7 @@ static u32 arcfour_byte(struct arc4context *parc4ctx)
u32 y; u32 y;
u32 sx, sy; u32 sx, sy;
u8 *state; u8 *state;
_func_enter_;
state = parc4ctx->state; state = parc4ctx->state;
x = (parc4ctx->x + 1) & 0xff; x = (parc4ctx->x + 1) & 0xff;
sx = state[x]; sx = state[x];
@ -77,17 +77,17 @@ _func_enter_;
parc4ctx->y = y; parc4ctx->y = y;
state[y] = (u8)sx; state[y] = (u8)sx;
state[x] = (u8)sy; state[x] = (u8)sy;
_func_exit_;
return state[(sx + sy) & 0xff]; return state[(sx + sy) & 0xff];
} }
static void arcfour_encrypt(struct arc4context *parc4ctx, u8 *dest, u8 *src, u32 len) static void arcfour_encrypt(struct arc4context *parc4ctx, u8 *dest, u8 *src, u32 len)
{ {
u32 i; u32 i;
_func_enter_;
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
dest[i] = src[i] ^ (unsigned char)arcfour_byte(parc4ctx); dest[i] = src[i] ^ (unsigned char)arcfour_byte(parc4ctx);
_func_exit_;
} }
static int bcrc32initialized; static int bcrc32initialized;
@ -102,9 +102,8 @@ static u8 crc32_reverseBit(u8 data)
static void crc32_init(void) static void crc32_init(void)
{ {
_func_enter_;
if (bcrc32initialized == 1) { if (bcrc32initialized == 1) {
goto exit; return;
} else { } else {
int i, j; int i, j;
u32 c; u32 c;
@ -126,15 +125,13 @@ _func_enter_;
} }
bcrc32initialized = 1; bcrc32initialized = 1;
} }
exit:
_func_exit_;
} }
static __le32 getcrc32(u8 *buf, int len) static __le32 getcrc32(u8 *buf, int len)
{ {
u8 *p; u8 *p;
u32 crc; u32 crc;
_func_enter_;
if (bcrc32initialized == 0) if (bcrc32initialized == 0)
crc32_init(); crc32_init();
@ -142,7 +139,7 @@ _func_enter_;
for (p = buf; len > 0; ++p, --len) for (p = buf; len > 0; ++p, --len)
crc = crc32_table[(crc ^ *p) & 0xff] ^ (crc >> 8); crc = crc32_table[(crc ^ *p) & 0xff] ^ (crc >> 8);
_func_exit_;
return cpu_to_le32(~crc); /* transmit complement, per CRC-32 spec */ return cpu_to_le32(~crc); /* transmit complement, per CRC-32 spec */
} }
@ -165,7 +162,7 @@ void rtw_wep_encrypt(struct adapter *padapter, u8 *pxmitframe)
struct security_priv *psecuritypriv = &padapter->securitypriv; struct security_priv *psecuritypriv = &padapter->securitypriv;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
_func_enter_;
if (((struct xmit_frame *)pxmitframe)->buf_addr == NULL) if (((struct xmit_frame *)pxmitframe)->buf_addr == NULL)
return; return;
@ -206,7 +203,7 @@ _func_enter_;
} }
} }
_func_exit_;
} }
void rtw_wep_decrypt(struct adapter *padapter, u8 *precvframe) void rtw_wep_decrypt(struct adapter *padapter, u8 *precvframe)
@ -221,7 +218,7 @@ void rtw_wep_decrypt(struct adapter *padapter, u8 *precvframe)
struct rx_pkt_attrib *prxattrib = &(((union recv_frame *)precvframe)->u.hdr.attrib); struct rx_pkt_attrib *prxattrib = &(((union recv_frame *)precvframe)->u.hdr.attrib);
struct security_priv *psecuritypriv = &padapter->securitypriv; struct security_priv *psecuritypriv = &padapter->securitypriv;
_func_enter_;
pframe = (unsigned char *)((union recv_frame *)precvframe)->u.hdr.rx_data; pframe = (unsigned char *)((union recv_frame *)precvframe)->u.hdr.rx_data;
@ -252,7 +249,7 @@ _func_enter_;
&crc, &payload[length-4])); &crc, &payload[length-4]));
} }
} }
_func_exit_;
return; return;
} }
@ -263,10 +260,10 @@ static u32 secmicgetuint32(u8 *p)
{ {
s32 i; s32 i;
u32 res = 0; u32 res = 0;
_func_enter_;
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
res |= ((u32)(*p++)) << (8*i); res |= ((u32)(*p++)) << (8*i);
_func_exit_;
return res; return res;
} }
@ -274,39 +271,39 @@ static void secmicputuint32(u8 *p, u32 val)
/* Convert from Us3232 to Byte[] in a portable way */ /* Convert from Us3232 to Byte[] in a portable way */
{ {
long i; long i;
_func_enter_;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
*p++ = (u8) (val & 0xff); *p++ = (u8) (val & 0xff);
val >>= 8; val >>= 8;
} }
_func_exit_;
} }
static void secmicclear(struct mic_data *pmicdata) static void secmicclear(struct mic_data *pmicdata)
{ {
/* Reset the state to the empty message. */ /* Reset the state to the empty message. */
_func_enter_;
pmicdata->L = pmicdata->K0; pmicdata->L = pmicdata->K0;
pmicdata->R = pmicdata->K1; pmicdata->R = pmicdata->K1;
pmicdata->nBytesInM = 0; pmicdata->nBytesInM = 0;
pmicdata->M = 0; pmicdata->M = 0;
_func_exit_;
} }
void rtw_secmicsetkey(struct mic_data *pmicdata, u8 *key) void rtw_secmicsetkey(struct mic_data *pmicdata, u8 *key)
{ {
/* Set the key */ /* Set the key */
_func_enter_;
pmicdata->K0 = secmicgetuint32(key); pmicdata->K0 = secmicgetuint32(key);
pmicdata->K1 = secmicgetuint32(key + 4); pmicdata->K1 = secmicgetuint32(key + 4);
/* and reset the message */ /* and reset the message */
secmicclear(pmicdata); secmicclear(pmicdata);
_func_exit_;
} }
void rtw_secmicappendbyte(struct mic_data *pmicdata, u8 b) void rtw_secmicappendbyte(struct mic_data *pmicdata, u8 b)
{ {
_func_enter_;
/* Append the byte to our word-sized buffer */ /* Append the byte to our word-sized buffer */
pmicdata->M |= ((unsigned long)b) << (8*pmicdata->nBytesInM); pmicdata->M |= ((unsigned long)b) << (8*pmicdata->nBytesInM);
pmicdata->nBytesInM++; pmicdata->nBytesInM++;
@ -325,23 +322,23 @@ _func_enter_;
pmicdata->M = 0; pmicdata->M = 0;
pmicdata->nBytesInM = 0; pmicdata->nBytesInM = 0;
} }
_func_exit_;
} }
void rtw_secmicappend(struct mic_data *pmicdata, u8 *src, u32 nbytes) void rtw_secmicappend(struct mic_data *pmicdata, u8 *src, u32 nbytes)
{ {
_func_enter_;
/* This is simple */ /* This is simple */
while (nbytes > 0) { while (nbytes > 0) {
rtw_secmicappendbyte(pmicdata, *src++); rtw_secmicappendbyte(pmicdata, *src++);
nbytes--; nbytes--;
} }
_func_exit_;
} }
void rtw_secgetmic(struct mic_data *pmicdata, u8 *dst) void rtw_secgetmic(struct mic_data *pmicdata, u8 *dst)
{ {
_func_enter_;
/* Append the minimum padding */ /* Append the minimum padding */
rtw_secmicappendbyte(pmicdata, 0x5a); rtw_secmicappendbyte(pmicdata, 0x5a);
rtw_secmicappendbyte(pmicdata, 0); rtw_secmicappendbyte(pmicdata, 0);
@ -356,14 +353,14 @@ _func_enter_;
secmicputuint32(dst+4, pmicdata->R); secmicputuint32(dst+4, pmicdata->R);
/* Reset to the empty message. */ /* Reset to the empty message. */
secmicclear(pmicdata); secmicclear(pmicdata);
_func_exit_;
} }
void rtw_seccalctkipmic(u8 *key, u8 *header, u8 *data, u32 data_len, u8 *mic_code, u8 pri) void rtw_seccalctkipmic(u8 *key, u8 *header, u8 *data, u32 data_len, u8 *mic_code, u8 pri)
{ {
struct mic_data micdata; struct mic_data micdata;
u8 priority[4] = {0x0, 0x0, 0x0, 0x0}; u8 priority[4] = {0x0, 0x0, 0x0, 0x0};
_func_enter_;
rtw_secmicsetkey(&micdata, key); rtw_secmicsetkey(&micdata, key);
priority[0] = pri; priority[0] = pri;
@ -386,7 +383,7 @@ _func_enter_;
rtw_secmicappend(&micdata, data, data_len); rtw_secmicappend(&micdata, data, data_len);
rtw_secgetmic(&micdata, mic_code); rtw_secgetmic(&micdata, mic_code);
_func_exit_;
} }
@ -505,7 +502,7 @@ static const unsigned short Sbox1[2][256] = { /* Sbox for hash (can be in ROM)
static void phase1(u16 *p1k, const u8 *tk, const u8 *ta, u32 iv32) static void phase1(u16 *p1k, const u8 *tk, const u8 *ta, u32 iv32)
{ {
int i; int i;
_func_enter_;
/* Initialize the 80 bits of P1K[] from IV32 and TA[0..5] */ /* Initialize the 80 bits of P1K[] from IV32 and TA[0..5] */
p1k[0] = Lo16(iv32); p1k[0] = Lo16(iv32);
p1k[1] = Hi16(iv32); p1k[1] = Hi16(iv32);
@ -523,7 +520,7 @@ _func_enter_;
p1k[4] += _S_(p1k[3] ^ TK16((i&1)+0)); p1k[4] += _S_(p1k[3] ^ TK16((i&1)+0));
p1k[4] += (unsigned short)i; /* avoid "slide attacks" */ p1k[4] += (unsigned short)i; /* avoid "slide attacks" */
} }
_func_exit_;
} }
/* /*
@ -553,7 +550,7 @@ static void phase2(u8 *rc4key, const u8 *tk, const u16 *p1k, u16 iv16)
{ {
int i; int i;
u16 PPK[6]; /* temporary key for mixing */ u16 PPK[6]; /* temporary key for mixing */
_func_enter_;
/* Note: all adds in the PPK[] equations below are mod 2**16 */ /* Note: all adds in the PPK[] equations below are mod 2**16 */
for (i = 0; i < 5; i++) for (i = 0; i < 5; i++)
PPK[i] = p1k[i]; /* first, copy P1K to PPK */ PPK[i] = p1k[i]; /* first, copy P1K to PPK */
@ -590,7 +587,7 @@ _func_enter_;
rc4key[4+2*i] = Lo8(PPK[i]); rc4key[4+2*i] = Lo8(PPK[i]);
rc4key[5+2*i] = Hi8(PPK[i]); rc4key[5+2*i] = Hi8(PPK[i]);
} }
_func_exit_;
} }
/* The hlen isn't include the IV */ /* The hlen isn't include the IV */
@ -612,7 +609,7 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)
struct security_priv *psecuritypriv = &padapter->securitypriv; struct security_priv *psecuritypriv = &padapter->securitypriv;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
u32 res = _SUCCESS; u32 res = _SUCCESS;
_func_enter_;
if (((struct xmit_frame *)pxmitframe)->buf_addr == NULL) if (((struct xmit_frame *)pxmitframe)->buf_addr == NULL)
return _FAIL; return _FAIL;
@ -672,7 +669,7 @@ _func_enter_;
res = _FAIL; res = _FAIL;
} }
} }
_func_exit_;
return res; return res;
} }
@ -694,7 +691,7 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe)
struct security_priv *psecuritypriv = &padapter->securitypriv; struct security_priv *psecuritypriv = &padapter->securitypriv;
u32 res = _SUCCESS; u32 res = _SUCCESS;
_func_enter_;
pframe = (unsigned char *)((union recv_frame *)precvframe)->u.hdr.rx_data; pframe = (unsigned char *)((union recv_frame *)precvframe)->u.hdr.rx_data;
@ -747,7 +744,7 @@ _func_enter_;
res = _FAIL; res = _FAIL;
} }
} }
_func_exit_;
exit: exit:
return res; return res;
} }
@ -821,19 +818,19 @@ static void aes128k128d(u8 *key, u8 *data, u8 *ciphertext);
static void xor_128(u8 *a, u8 *b, u8 *out) static void xor_128(u8 *a, u8 *b, u8 *out)
{ {
int i; int i;
_func_enter_;
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
out[i] = a[i] ^ b[i]; out[i] = a[i] ^ b[i];
_func_exit_;
} }
static void xor_32(u8 *a, u8 *b, u8 *out) static void xor_32(u8 *a, u8 *b, u8 *out)
{ {
int i; int i;
_func_enter_;
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
out[i] = a[i] ^ b[i]; out[i] = a[i] ^ b[i];
_func_exit_;
} }
static u8 sbox(u8 a) static u8 sbox(u8 a)
@ -849,7 +846,7 @@ static void next_key(u8 *key, int round)
0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80,
0x1b, 0x36, 0x36, 0x36 0x1b, 0x36, 0x36, 0x36
}; };
_func_enter_;
sbox_key[0] = sbox(key[13]); sbox_key[0] = sbox(key[13]);
sbox_key[1] = sbox(key[14]); sbox_key[1] = sbox(key[14]);
sbox_key[2] = sbox(key[15]); sbox_key[2] = sbox(key[15]);
@ -863,21 +860,21 @@ _func_enter_;
xor_32(&key[4], &key[0], &key[4]); xor_32(&key[4], &key[0], &key[4]);
xor_32(&key[8], &key[4], &key[8]); xor_32(&key[8], &key[4], &key[8]);
xor_32(&key[12], &key[8], &key[12]); xor_32(&key[12], &key[8], &key[12]);
_func_exit_;
} }
static void byte_sub(u8 *in, u8 *out) static void byte_sub(u8 *in, u8 *out)
{ {
int i; int i;
_func_enter_;
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
out[i] = sbox(in[i]); out[i] = sbox(in[i]);
_func_exit_;
} }
static void shift_row(u8 *in, u8 *out) static void shift_row(u8 *in, u8 *out)
{ {
_func_enter_;
out[0] = in[0]; out[0] = in[0];
out[1] = in[5]; out[1] = in[5];
out[2] = in[10]; out[2] = in[10];
@ -894,7 +891,7 @@ _func_enter_;
out[13] = in[1]; out[13] = in[1];
out[14] = in[6]; out[14] = in[6];
out[15] = in[11]; out[15] = in[11];
_func_exit_;
} }
static void mix_column(u8 *in, u8 *out) static void mix_column(u8 *in, u8 *out)
@ -908,7 +905,7 @@ static void mix_column(u8 *in, u8 *out)
u8 rotr[4]; u8 rotr[4];
u8 temp[4]; u8 temp[4];
u8 tempb[4]; u8 tempb[4];
_func_enter_;
for (i = 0 ; i < 4; i++) { for (i = 0 ; i < 4; i++) {
if ((in[i] & 0x80) == 0x80) if ((in[i] & 0x80) == 0x80)
add1b[i] = 0x1b; add1b[i] = 0x1b;
@ -952,7 +949,7 @@ _func_enter_;
xor_32(add1bf7, rotr, temp); xor_32(add1bf7, rotr, temp);
xor_32(swap_halfs, rotl, tempb); xor_32(swap_halfs, rotl, tempb);
xor_32(temp, tempb, out); xor_32(temp, tempb, out);
_func_exit_;
} }
static void aes128k128d(u8 *key, u8 *data, u8 *ciphertext) static void aes128k128d(u8 *key, u8 *data, u8 *ciphertext)
@ -962,7 +959,7 @@ static void aes128k128d(u8 *key, u8 *data, u8 *ciphertext)
u8 intermediatea[16]; u8 intermediatea[16];
u8 intermediateb[16]; u8 intermediateb[16];
u8 round_key[16]; u8 round_key[16];
_func_enter_;
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
round_key[i] = key[i]; round_key[i] = key[i];
for (round = 0; round < 11; round++) { for (round = 0; round < 11; round++) {
@ -984,7 +981,7 @@ _func_enter_;
next_key(round_key, round); next_key(round_key, round);
} }
} }
_func_exit_;
} }
/************************************************/ /************************************************/
@ -995,7 +992,7 @@ static void construct_mic_iv(u8 *mic_iv, int qc_exists, int a4_exists, u8 *mpdu,
uint payload_length, u8 *pn_vector) uint payload_length, u8 *pn_vector)
{ {
int i; int i;
_func_enter_;
mic_iv[0] = 0x59; mic_iv[0] = 0x59;
if (qc_exists && a4_exists) if (qc_exists && a4_exists)
mic_iv[1] = mpdu[30] & 0x0f; /* QoS_TC */ mic_iv[1] = mpdu[30] & 0x0f; /* QoS_TC */
@ -1009,7 +1006,7 @@ _func_enter_;
mic_iv[i] = pn_vector[13 - i]; /* mic_iv[8:13] = PN[5:0] */ mic_iv[i] = pn_vector[13 - i]; /* mic_iv[8:13] = PN[5:0] */
mic_iv[14] = (unsigned char) (payload_length / 256); mic_iv[14] = (unsigned char) (payload_length / 256);
mic_iv[15] = (unsigned char) (payload_length % 256); mic_iv[15] = (unsigned char) (payload_length % 256);
_func_exit_;
} }
/************************************************/ /************************************************/
@ -1019,7 +1016,7 @@ _func_exit_;
/************************************************/ /************************************************/
static void construct_mic_header1(u8 *mic_header1, int header_length, u8 *mpdu) static void construct_mic_header1(u8 *mic_header1, int header_length, u8 *mpdu)
{ {
_func_enter_;
mic_header1[0] = (u8)((header_length - 2) / 256); mic_header1[0] = (u8)((header_length - 2) / 256);
mic_header1[1] = (u8)((header_length - 2) % 256); mic_header1[1] = (u8)((header_length - 2) % 256);
mic_header1[2] = mpdu[0] & 0xcf; /* Mute CF poll & CF ack bits */ mic_header1[2] = mpdu[0] & 0xcf; /* Mute CF poll & CF ack bits */
@ -1036,7 +1033,7 @@ _func_enter_;
mic_header1[13] = mpdu[13]; mic_header1[13] = mpdu[13];
mic_header1[14] = mpdu[14]; mic_header1[14] = mpdu[14];
mic_header1[15] = mpdu[15]; mic_header1[15] = mpdu[15];
_func_exit_;
} }
/************************************************/ /************************************************/
@ -1047,7 +1044,7 @@ _func_exit_;
static void construct_mic_header2(u8 *mic_header2, u8 *mpdu, int a4_exists, int qc_exists) static void construct_mic_header2(u8 *mic_header2, u8 *mpdu, int a4_exists, int qc_exists)
{ {
int i; int i;
_func_enter_;
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
mic_header2[i] = 0x00; mic_header2[i] = 0x00;
@ -1079,7 +1076,7 @@ _func_enter_;
mic_header2[15] = mpdu[31] & 0x00; mic_header2[15] = mpdu[31] & 0x00;
} }
_func_exit_;
} }
/************************************************/ /************************************************/
@ -1090,7 +1087,7 @@ _func_exit_;
static void construct_ctr_preload(u8 *ctr_preload, int a4_exists, int qc_exists, u8 *mpdu, u8 *pn_vector, int c) static void construct_ctr_preload(u8 *ctr_preload, int a4_exists, int qc_exists, u8 *mpdu, u8 *pn_vector, int c)
{ {
int i; int i;
_func_enter_;
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
ctr_preload[i] = 0x00; ctr_preload[i] = 0x00;
i = 0; i = 0;
@ -1107,7 +1104,7 @@ _func_enter_;
ctr_preload[i] = pn_vector[13 - i]; /* ctr_preload[8:13] = PN[5:0] */ ctr_preload[i] = pn_vector[13 - i]; /* ctr_preload[8:13] = PN[5:0] */
ctr_preload[14] = (unsigned char) (c / 256); /* Ctr */ ctr_preload[14] = (unsigned char) (c / 256); /* Ctr */
ctr_preload[15] = (unsigned char) (c % 256); ctr_preload[15] = (unsigned char) (c % 256);
_func_exit_;
} }
/************************************/ /************************************/
@ -1117,10 +1114,10 @@ _func_exit_;
static void bitwise_xor(u8 *ina, u8 *inb, u8 *out) static void bitwise_xor(u8 *ina, u8 *inb, u8 *out)
{ {
int i; int i;
_func_enter_;
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
out[i] = ina[i] ^ inb[i]; out[i] = ina[i] ^ inb[i];
_func_exit_;
} }
static int aes_cipher(u8 *key, uint hdrlen, u8 *pframe, uint plen) static int aes_cipher(u8 *key, uint hdrlen, u8 *pframe, uint plen)
@ -1142,7 +1139,7 @@ static int aes_cipher(u8 *key, uint hdrlen, u8 *pframe, uint plen)
uint frtype = GetFrameType(pframe); uint frtype = GetFrameType(pframe);
uint frsubtype = GetFrameSubType(pframe); uint frsubtype = GetFrameSubType(pframe);
_func_enter_;
frsubtype = frsubtype>>4; frsubtype = frsubtype>>4;
_rtw_memset((void *)mic_iv, 0, 16); _rtw_memset((void *)mic_iv, 0, 16);
@ -1253,7 +1250,7 @@ _func_enter_;
bitwise_xor(aes_out, padded_buffer, chain_buffer); bitwise_xor(aes_out, padded_buffer, chain_buffer);
for (j = 0; j < 8; j++) for (j = 0; j < 8; j++)
pframe[payload_index++] = chain_buffer[j]; pframe[payload_index++] = chain_buffer[j];
_func_exit_;
return _SUCCESS; return _SUCCESS;
} }
@ -1274,7 +1271,7 @@ u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe)
/* uint offset = 0; */ /* uint offset = 0; */
u32 res = _SUCCESS; u32 res = _SUCCESS;
_func_enter_;
if (((struct xmit_frame *)pxmitframe)->buf_addr == NULL) if (((struct xmit_frame *)pxmitframe)->buf_addr == NULL)
return _FAIL; return _FAIL;
@ -1318,7 +1315,7 @@ _func_enter_;
} }
_func_exit_;
return res; return res;
} }
@ -1344,7 +1341,7 @@ static int aes_decipher(u8 *key, uint hdrlen,
/* uint offset = 0; */ /* uint offset = 0; */
uint frtype = GetFrameType(pframe); uint frtype = GetFrameType(pframe);
uint frsubtype = GetFrameSubType(pframe); uint frsubtype = GetFrameSubType(pframe);
_func_enter_;
frsubtype = frsubtype>>4; frsubtype = frsubtype>>4;
_rtw_memset((void *)mic_iv, 0, 16); _rtw_memset((void *)mic_iv, 0, 16);
@ -1514,7 +1511,7 @@ _func_enter_;
res = _FAIL; res = _FAIL;
} }
} }
_func_exit_;
return res; return res;
} }
@ -1527,7 +1524,7 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe)
struct rx_pkt_attrib *prxattrib = &((union recv_frame *)precvframe)->u.hdr.attrib; struct rx_pkt_attrib *prxattrib = &((union recv_frame *)precvframe)->u.hdr.attrib;
struct security_priv *psecuritypriv = &padapter->securitypriv; struct security_priv *psecuritypriv = &padapter->securitypriv;
u32 res = _SUCCESS; u32 res = _SUCCESS;
_func_enter_;
pframe = (unsigned char *)((union recv_frame *)precvframe)->u.hdr.rx_data; pframe = (unsigned char *)((union recv_frame *)precvframe)->u.hdr.rx_data;
/* 4 start to encrypt each fragment */ /* 4 start to encrypt each fragment */
if ((prxattrib->encrypt == _AES_)) { if ((prxattrib->encrypt == _AES_)) {
@ -1559,7 +1556,7 @@ _func_enter_;
res = _FAIL; res = _FAIL;
} }
} }
_func_exit_;
exit: exit:
return res; return res;
} }
@ -1767,7 +1764,7 @@ void rtw_use_tkipkey_handler(void *FunctionContext)
{ {
struct adapter *padapter = (struct adapter *)FunctionContext; struct adapter *padapter = (struct adapter *)FunctionContext;
_func_enter_;
RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("^^^rtw_use_tkipkey_handler ^^^\n")); RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("^^^rtw_use_tkipkey_handler ^^^\n"));
@ -1775,5 +1772,5 @@ _func_enter_;
RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("^^^rtw_use_tkipkey_handler padapter->securitypriv.busetkipkey=%d^^^\n", padapter->securitypriv.busetkipkey)); RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("^^^rtw_use_tkipkey_handler padapter->securitypriv.busetkipkey=%d^^^\n", padapter->securitypriv.busetkipkey));
_func_exit_;
} }

57
core/rtw_sta_mgt.c
View file

@ -28,7 +28,7 @@
static void _rtw_init_stainfo(struct sta_info *psta) static void _rtw_init_stainfo(struct sta_info *psta)
{ {
_func_enter_;
_rtw_memset((u8 *)psta, 0, sizeof (struct sta_info)); _rtw_memset((u8 *)psta, 0, sizeof (struct sta_info));
spin_lock_init(&psta->lock); spin_lock_init(&psta->lock);
@ -69,7 +69,7 @@ _func_enter_;
#endif /* CONFIG_88EU_AP_MODE */ #endif /* CONFIG_88EU_AP_MODE */
_func_exit_;
} }
u32 _rtw_init_sta_priv(struct sta_priv *pstapriv) u32 _rtw_init_sta_priv(struct sta_priv *pstapriv)
@ -77,7 +77,7 @@ u32 _rtw_init_sta_priv(struct sta_priv *pstapriv)
struct sta_info *psta; struct sta_info *psta;
s32 i; s32 i;
_func_enter_;
pstapriv->pallocated_stainfo_buf = rtw_zvmalloc(sizeof(struct sta_info) * NUM_STA + 4); pstapriv->pallocated_stainfo_buf = rtw_zvmalloc(sizeof(struct sta_info) * NUM_STA + 4);
@ -125,7 +125,7 @@ _func_enter_;
pstapriv->max_num_sta = NUM_STA; pstapriv->max_num_sta = NUM_STA;
#endif #endif
_func_exit_;
return _SUCCESS; return _SUCCESS;
} }
@ -151,7 +151,7 @@ inline struct sta_info *rtw_get_stainfo_by_offset(struct sta_priv *stapriv, int
void _rtw_free_sta_xmit_priv_lock(struct sta_xmit_priv *psta_xmitpriv); void _rtw_free_sta_xmit_priv_lock(struct sta_xmit_priv *psta_xmitpriv);
void _rtw_free_sta_xmit_priv_lock(struct sta_xmit_priv *psta_xmitpriv) void _rtw_free_sta_xmit_priv_lock(struct sta_xmit_priv *psta_xmitpriv)
{ {
_func_enter_;
_rtw_spinlock_free(&psta_xmitpriv->lock); _rtw_spinlock_free(&psta_xmitpriv->lock);
@ -159,24 +159,24 @@ _func_enter_;
_rtw_spinlock_free(&(psta_xmitpriv->bk_q.sta_pending.lock)); _rtw_spinlock_free(&(psta_xmitpriv->bk_q.sta_pending.lock));
_rtw_spinlock_free(&(psta_xmitpriv->vi_q.sta_pending.lock)); _rtw_spinlock_free(&(psta_xmitpriv->vi_q.sta_pending.lock));
_rtw_spinlock_free(&(psta_xmitpriv->vo_q.sta_pending.lock)); _rtw_spinlock_free(&(psta_xmitpriv->vo_q.sta_pending.lock));
_func_exit_;
} }
static void _rtw_free_sta_recv_priv_lock(struct sta_recv_priv *psta_recvpriv) static void _rtw_free_sta_recv_priv_lock(struct sta_recv_priv *psta_recvpriv)
{ {
_func_enter_;
_rtw_spinlock_free(&psta_recvpriv->lock); _rtw_spinlock_free(&psta_recvpriv->lock);
_rtw_spinlock_free(&(psta_recvpriv->defrag_q.lock)); _rtw_spinlock_free(&(psta_recvpriv->defrag_q.lock));
_func_exit_;
} }
void rtw_mfree_stainfo(struct sta_info *psta); void rtw_mfree_stainfo(struct sta_info *psta);
void rtw_mfree_stainfo(struct sta_info *psta) void rtw_mfree_stainfo(struct sta_info *psta)
{ {
_func_enter_;
if (&psta->lock != NULL) if (&psta->lock != NULL)
_rtw_spinlock_free(&psta->lock); _rtw_spinlock_free(&psta->lock);
@ -184,7 +184,7 @@ _func_enter_;
_rtw_free_sta_xmit_priv_lock(&psta->sta_xmitpriv); _rtw_free_sta_xmit_priv_lock(&psta->sta_xmitpriv);
_rtw_free_sta_recv_priv_lock(&psta->sta_recvpriv); _rtw_free_sta_recv_priv_lock(&psta->sta_recvpriv);
_func_exit_;
} }
/* this function is used to free the memory of lock || sema for all stainfos */ /* this function is used to free the memory of lock || sema for all stainfos */
@ -194,7 +194,7 @@ void rtw_mfree_all_stainfo(struct sta_priv *pstapriv)
struct list_head *plist, *phead; struct list_head *plist, *phead;
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
_func_enter_;
spin_lock_bh(&pstapriv->sta_hash_lock); spin_lock_bh(&pstapriv->sta_hash_lock);
@ -210,7 +210,7 @@ _func_enter_;
spin_unlock_bh(&pstapriv->sta_hash_lock); spin_unlock_bh(&pstapriv->sta_hash_lock);
_func_exit_;
} }
static void rtw_mfree_sta_priv_lock(struct sta_priv *pstapriv) static void rtw_mfree_sta_priv_lock(struct sta_priv *pstapriv)
@ -241,7 +241,7 @@ u32 _rtw_free_sta_priv(struct sta_priv *pstapriv)
struct recv_reorder_ctrl *preorder_ctrl; struct recv_reorder_ctrl *preorder_ctrl;
int index; int index;
_func_enter_;
if (pstapriv) { if (pstapriv) {
/* delete all reordering_ctrl_timer */ /* delete all reordering_ctrl_timer */
spin_lock_bh(&pstapriv->sta_hash_lock); spin_lock_bh(&pstapriv->sta_hash_lock);
@ -269,7 +269,7 @@ _func_enter_;
rtw_vmfree(pstapriv->pallocated_stainfo_buf, sizeof(struct sta_info)*NUM_STA+4); rtw_vmfree(pstapriv->pallocated_stainfo_buf, sizeof(struct sta_info)*NUM_STA+4);
} }
_func_exit_;
return _SUCCESS; return _SUCCESS;
} }
@ -283,7 +283,7 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)
int i = 0; int i = 0;
u16 wRxSeqInitialValue = 0xffff; u16 wRxSeqInitialValue = 0xffff;
_func_enter_;
pfree_sta_queue = &pstapriv->free_sta_queue; pfree_sta_queue = &pstapriv->free_sta_queue;
@ -356,7 +356,7 @@ _func_enter_;
exit: exit:
_func_exit_;
return psta; return psta;
} }
@ -371,7 +371,7 @@ u32 rtw_free_stainfo(struct adapter *padapter , struct sta_info *psta)
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
_func_enter_;
if (psta == NULL) if (psta == NULL)
goto exit; goto exit;
@ -486,7 +486,7 @@ _func_enter_;
exit: exit:
_func_exit_;
return _SUCCESS; return _SUCCESS;
} }
@ -500,10 +500,8 @@ void rtw_free_all_stainfo(struct adapter *padapter)
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct sta_info *pbcmc_stainfo = rtw_get_bcmc_stainfo(padapter); struct sta_info *pbcmc_stainfo = rtw_get_bcmc_stainfo(padapter);
_func_enter_;
if (pstapriv->asoc_sta_count == 1) if (pstapriv->asoc_sta_count == 1)
goto exit; return;
spin_lock_bh(&pstapriv->sta_hash_lock); spin_lock_bh(&pstapriv->sta_hash_lock);
@ -520,12 +518,7 @@ _func_enter_;
rtw_free_stainfo(padapter , psta); rtw_free_stainfo(padapter , psta);
} }
} }
spin_unlock_bh(&pstapriv->sta_hash_lock); spin_unlock_bh(&pstapriv->sta_hash_lock);
exit:
_func_exit_;
} }
/* any station allocated can be searched by hash list */ /* any station allocated can be searched by hash list */
@ -537,7 +530,7 @@ struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)
u8 *addr; u8 *addr;
u8 bc_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; u8 bc_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
_func_enter_;
if (hwaddr == NULL) if (hwaddr == NULL)
return NULL; return NULL;
@ -566,7 +559,7 @@ _func_enter_;
} }
spin_unlock_bh(&pstapriv->sta_hash_lock); spin_unlock_bh(&pstapriv->sta_hash_lock);
_func_exit_;
return psta; return psta;
} }
@ -577,7 +570,7 @@ u32 rtw_init_bcmc_stainfo(struct adapter *padapter)
unsigned char bcast_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; unsigned char bcast_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
_func_enter_;
psta = rtw_alloc_stainfo(pstapriv, bcast_addr); psta = rtw_alloc_stainfo(pstapriv, bcast_addr);
@ -591,7 +584,7 @@ _func_enter_;
psta->mac_id = 1; psta->mac_id = 1;
exit: exit:
_func_exit_;
return res; return res;
} }
@ -600,9 +593,9 @@ struct sta_info *rtw_get_bcmc_stainfo(struct adapter *padapter)
struct sta_info *psta; struct sta_info *psta;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
u8 bc_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; u8 bc_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
_func_enter_;
psta = rtw_get_stainfo(pstapriv, bc_addr); psta = rtw_get_stainfo(pstapriv, bc_addr);
_func_exit_;
return psta; return psta;
} }

4
core/rtw_wlan_util.c
View file

@ -1096,12 +1096,12 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)
} }
kfree(bssid); kfree(bssid);
_func_exit_;
return _SUCCESS; return _SUCCESS;
_mismatch: _mismatch:
kfree(bssid); kfree(bssid);
_func_exit_;
return _FAIL; return _FAIL;
} }

92
core/rtw_xmit.c
View file

@ -32,16 +32,16 @@ static u8 RFC1042_OUI[P80211_OUI_LEN] = { 0x00, 0x00, 0x00 };
static void _init_txservq(struct tx_servq *ptxservq) static void _init_txservq(struct tx_servq *ptxservq)
{ {
_func_enter_;
_rtw_init_listhead(&ptxservq->tx_pending); _rtw_init_listhead(&ptxservq->tx_pending);
_rtw_init_queue(&ptxservq->sta_pending); _rtw_init_queue(&ptxservq->sta_pending);
ptxservq->qcnt = 0; ptxservq->qcnt = 0;
_func_exit_;
} }
void _rtw_init_sta_xmit_priv(struct sta_xmit_priv *psta_xmitpriv) void _rtw_init_sta_xmit_priv(struct sta_xmit_priv *psta_xmitpriv)
{ {
_func_enter_;
_rtw_memset((unsigned char *)psta_xmitpriv, 0, sizeof (struct sta_xmit_priv)); _rtw_memset((unsigned char *)psta_xmitpriv, 0, sizeof (struct sta_xmit_priv));
spin_lock_init(&psta_xmitpriv->lock); spin_lock_init(&psta_xmitpriv->lock);
_init_txservq(&psta_xmitpriv->be_q); _init_txservq(&psta_xmitpriv->be_q);
@ -51,7 +51,7 @@ _func_enter_;
_rtw_init_listhead(&psta_xmitpriv->legacy_dz); _rtw_init_listhead(&psta_xmitpriv->legacy_dz);
_rtw_init_listhead(&psta_xmitpriv->apsd); _rtw_init_listhead(&psta_xmitpriv->apsd);
_func_exit_;
} }
s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
@ -63,7 +63,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
u32 max_xmit_extbuf_size = MAX_XMIT_EXTBUF_SZ; u32 max_xmit_extbuf_size = MAX_XMIT_EXTBUF_SZ;
u32 num_xmit_extbuf = NR_XMIT_EXTBUFF; u32 num_xmit_extbuf = NR_XMIT_EXTBUFF;
_func_enter_;
/* We don't need to memset padapter->XXX to zero, because adapter is allocated by rtw_zvmalloc(). */ /* We don't need to memset padapter->XXX to zero, because adapter is allocated by rtw_zvmalloc(). */
@ -226,7 +226,7 @@ _func_enter_;
exit: exit:
_func_exit_;
return res; return res;
} }
@ -257,14 +257,12 @@ void _rtw_free_xmit_priv (struct xmit_priv *pxmitpriv)
u32 max_xmit_extbuf_size = MAX_XMIT_EXTBUF_SZ; u32 max_xmit_extbuf_size = MAX_XMIT_EXTBUF_SZ;
u32 num_xmit_extbuf = NR_XMIT_EXTBUFF; u32 num_xmit_extbuf = NR_XMIT_EXTBUFF;
_func_enter_;
rtw_hal_free_xmit_priv(padapter); rtw_hal_free_xmit_priv(padapter);
rtw_mfree_xmit_priv_lock(pxmitpriv); rtw_mfree_xmit_priv_lock(pxmitpriv);
if (pxmitpriv->pxmit_frame_buf == NULL) if (pxmitpriv->pxmit_frame_buf == NULL)
goto out; return;
for (i = 0; i < NR_XMITFRAME; i++) { for (i = 0; i < NR_XMITFRAME; i++) {
rtw_os_xmit_complete(padapter, pxmitframe); rtw_os_xmit_complete(padapter, pxmitframe);
@ -299,10 +297,6 @@ void _rtw_free_xmit_priv (struct xmit_priv *pxmitpriv)
rtw_free_hwxmits(padapter); rtw_free_hwxmits(padapter);
_rtw_mutex_free(&pxmitpriv->ack_tx_mutex); _rtw_mutex_free(&pxmitpriv->ack_tx_mutex);
out:
_func_exit_;
} }
static void update_attrib_vcs_info(struct adapter *padapter, struct xmit_frame *pxmitframe) static void update_attrib_vcs_info(struct adapter *padapter, struct xmit_frame *pxmitframe)
@ -476,7 +470,7 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p
struct qos_priv *pqospriv = &pmlmepriv->qospriv; struct qos_priv *pqospriv = &pmlmepriv->qospriv;
int res = _SUCCESS; int res = _SUCCESS;
_func_enter_;
_rtw_open_pktfile(pkt, &pktfile); _rtw_open_pktfile(pkt, &pktfile);
_rtw_pktfile_read(&pktfile, (u8 *)&etherhdr, ETH_HLEN); _rtw_pktfile_read(&pktfile, (u8 *)&etherhdr, ETH_HLEN);
@ -660,7 +654,7 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p
exit: exit:
_func_exit_;
return res; return res;
} }
@ -683,7 +677,7 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr
else else
stainfo = rtw_get_stainfo(&padapter->stapriv , &pattrib->ra[0]); stainfo = rtw_get_stainfo(&padapter->stapriv , &pattrib->ra[0]);
_func_enter_;
hw_hdr_offset = TXDESC_SIZE + (pxmitframe->pkt_offset * PACKET_OFFSET_SZ);; hw_hdr_offset = TXDESC_SIZE + (pxmitframe->pkt_offset * PACKET_OFFSET_SZ);;
@ -781,7 +775,7 @@ _func_enter_;
} }
} }
_func_exit_;
return _SUCCESS; return _SUCCESS;
} }
@ -790,7 +784,7 @@ static s32 xmitframe_swencrypt(struct adapter *padapter, struct xmit_frame *pxmi
{ {
struct pkt_attrib *pattrib = &pxmitframe->attrib; struct pkt_attrib *pattrib = &pxmitframe->attrib;
_func_enter_;
if (pattrib->bswenc) { if (pattrib->bswenc) {
RT_TRACE(_module_rtl871x_xmit_c_, _drv_alert_, ("### xmitframe_swencrypt\n")); RT_TRACE(_module_rtl871x_xmit_c_, _drv_alert_, ("### xmitframe_swencrypt\n"));
@ -812,7 +806,7 @@ _func_enter_;
RT_TRACE(_module_rtl871x_xmit_c_, _drv_notice_, ("### xmitframe_hwencrypt\n")); RT_TRACE(_module_rtl871x_xmit_c_, _drv_notice_, ("### xmitframe_hwencrypt\n"));
} }
_func_exit_;
return _SUCCESS; return _SUCCESS;
} }
@ -833,7 +827,7 @@ s32 rtw_make_wlanhdr (struct adapter *padapter , u8 *hdr, struct pkt_attrib *pat
int bmcst = IS_MCAST(pattrib->ra); int bmcst = IS_MCAST(pattrib->ra);
_func_enter_;
if (pattrib->psta) { if (pattrib->psta) {
psta = pattrib->psta; psta = pattrib->psta;
@ -939,7 +933,7 @@ _func_enter_;
} }
exit: exit:
_func_exit_;
return res; return res;
} }
@ -1028,7 +1022,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct
s32 bmcst = IS_MCAST(pattrib->ra); s32 bmcst = IS_MCAST(pattrib->ra);
s32 res = _SUCCESS; s32 res = _SUCCESS;
_func_enter_;
psta = rtw_get_stainfo(&padapter->stapriv, pattrib->ra); psta = rtw_get_stainfo(&padapter->stapriv, pattrib->ra);
@ -1166,7 +1160,7 @@ _func_enter_;
exit: exit:
_func_exit_;
return res; return res;
} }
@ -1183,7 +1177,7 @@ s32 rtw_put_snap(u8 *data, u16 h_proto)
struct ieee80211_snap_hdr *snap; struct ieee80211_snap_hdr *snap;
u8 *oui; u8 *oui;
_func_enter_;
snap = (struct ieee80211_snap_hdr *)data; snap = (struct ieee80211_snap_hdr *)data;
snap->dsap = 0xaa; snap->dsap = 0xaa;
@ -1201,7 +1195,7 @@ _func_enter_;
*(__be16 *)(data + SNAP_SIZE) = htons(h_proto); *(__be16 *)(data + SNAP_SIZE) = htons(h_proto);
_func_exit_;
return SNAP_SIZE + sizeof(u16); return SNAP_SIZE + sizeof(u16);
} }
@ -1214,7 +1208,7 @@ void rtw_update_protection(struct adapter *padapter, u8 *ie, uint ie_len)
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
struct registry_priv *pregistrypriv = &padapter->registrypriv; struct registry_priv *pregistrypriv = &padapter->registrypriv;
_func_enter_;
switch (pxmitpriv->vcs_setting) { switch (pxmitpriv->vcs_setting) {
case DISABLE_VCS: case DISABLE_VCS:
@ -1241,7 +1235,7 @@ _func_enter_;
break; break;
} }
_func_exit_;
} }
void rtw_count_tx_stats(struct adapter *padapter, struct xmit_frame *pxmitframe, int sz) void rtw_count_tx_stats(struct adapter *padapter, struct xmit_frame *pxmitframe, int sz)
@ -1271,7 +1265,7 @@ struct xmit_buf *rtw_alloc_xmitbuf_ext(struct xmit_priv *pxmitpriv)
struct __queue *pfree_queue = &pxmitpriv->free_xmit_extbuf_queue; struct __queue *pfree_queue = &pxmitpriv->free_xmit_extbuf_queue;
unsigned long flags; unsigned long flags;
_func_enter_;
spin_lock_irqsave(&pfree_queue->lock, flags); spin_lock_irqsave(&pfree_queue->lock, flags);
@ -1301,7 +1295,7 @@ _func_enter_;
spin_unlock_irqrestore(&pfree_queue->lock, flags); spin_unlock_irqrestore(&pfree_queue->lock, flags);
_func_exit_;
return pxmitbuf; return pxmitbuf;
} }
@ -1311,7 +1305,7 @@ s32 rtw_free_xmitbuf_ext(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)
struct __queue *pfree_queue = &pxmitpriv->free_xmit_extbuf_queue; struct __queue *pfree_queue = &pxmitpriv->free_xmit_extbuf_queue;
unsigned long flags; unsigned long flags;
_func_enter_;
if (pxmitbuf == NULL) if (pxmitbuf == NULL)
return _FAIL; return _FAIL;
@ -1325,7 +1319,7 @@ _func_enter_;
spin_unlock_irqrestore(&pfree_queue->lock, flags); spin_unlock_irqrestore(&pfree_queue->lock, flags);
_func_exit_;
return _SUCCESS; return _SUCCESS;
} }
@ -1337,7 +1331,7 @@ struct xmit_buf *rtw_alloc_xmitbuf(struct xmit_priv *pxmitpriv)
struct __queue *pfree_xmitbuf_queue = &pxmitpriv->free_xmitbuf_queue; struct __queue *pfree_xmitbuf_queue = &pxmitpriv->free_xmitbuf_queue;
unsigned long flags; unsigned long flags;
_func_enter_;
/* DBG_88E("+rtw_alloc_xmitbuf\n"); */ /* DBG_88E("+rtw_alloc_xmitbuf\n"); */
@ -1365,7 +1359,7 @@ _func_enter_;
} }
spin_unlock_irqrestore(&pfree_xmitbuf_queue->lock, flags); spin_unlock_irqrestore(&pfree_xmitbuf_queue->lock, flags);
_func_exit_;
return pxmitbuf; return pxmitbuf;
} }
@ -1375,7 +1369,7 @@ s32 rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)
struct __queue *pfree_xmitbuf_queue = &pxmitpriv->free_xmitbuf_queue; struct __queue *pfree_xmitbuf_queue = &pxmitpriv->free_xmitbuf_queue;
unsigned long flags; unsigned long flags;
_func_enter_;
if (pxmitbuf == NULL) if (pxmitbuf == NULL)
return _FAIL; return _FAIL;
@ -1397,7 +1391,7 @@ _func_enter_;
spin_unlock_irqrestore(&pfree_xmitbuf_queue->lock, flags); spin_unlock_irqrestore(&pfree_xmitbuf_queue->lock, flags);
} }
_func_exit_;
return _SUCCESS; return _SUCCESS;
} }
@ -1426,7 +1420,7 @@ struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv)/* _queue *pf
struct list_head *plist, *phead; struct list_head *plist, *phead;
struct __queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue; struct __queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue;
_func_enter_;
spin_lock_bh(&pfree_xmit_queue->lock); spin_lock_bh(&pfree_xmit_queue->lock);
@ -1465,7 +1459,7 @@ _func_enter_;
spin_unlock_bh(&pfree_xmit_queue->lock); spin_unlock_bh(&pfree_xmit_queue->lock);
_func_exit_;
return pxframe; return pxframe;
} }
@ -1476,7 +1470,7 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitfram
struct adapter *padapter = pxmitpriv->adapter; struct adapter *padapter = pxmitpriv->adapter;
struct sk_buff *pndis_pkt = NULL; struct sk_buff *pndis_pkt = NULL;
_func_enter_;
if (pxmitframe == NULL) { if (pxmitframe == NULL) {
RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("====== rtw_free_xmitframe():pxmitframe == NULL!!!!!!!!!!\n")); RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("====== rtw_free_xmitframe():pxmitframe == NULL!!!!!!!!!!\n"));
@ -1504,7 +1498,7 @@ _func_enter_;
exit: exit:
_func_exit_;
return _SUCCESS; return _SUCCESS;
} }
@ -1514,7 +1508,7 @@ void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, struct __queue *pfram
struct list_head *plist, *phead; struct list_head *plist, *phead;
struct xmit_frame *pxmitframe; struct xmit_frame *pxmitframe;
_func_enter_;
spin_lock_bh(&pframequeue->lock); spin_lock_bh(&pframequeue->lock);
@ -1530,7 +1524,7 @@ _func_enter_;
} }
spin_unlock_bh(&pframequeue->lock); spin_unlock_bh(&pframequeue->lock);
_func_exit_;
} }
s32 rtw_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitframe) s32 rtw_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitframe)
@ -1576,7 +1570,7 @@ struct xmit_frame *rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmi
struct registry_priv *pregpriv = &padapter->registrypriv; struct registry_priv *pregpriv = &padapter->registrypriv;
int i, inx[4]; int i, inx[4];
_func_enter_;
inx[0] = 0; inx[1] = 1; inx[2] = 2; inx[3] = 3; inx[0] = 0; inx[1] = 1; inx[2] = 2; inx[3] = 3;
@ -1616,7 +1610,7 @@ _func_enter_;
} }
exit: exit:
spin_unlock_bh(&pxmitpriv->lock); spin_unlock_bh(&pxmitpriv->lock);
_func_exit_;
return pxmitframe; return pxmitframe;
} }
@ -1624,7 +1618,7 @@ struct tx_servq *rtw_get_sta_pending(struct adapter *padapter, struct sta_info *
{ {
struct tx_servq *ptxservq; struct tx_servq *ptxservq;
_func_enter_;
switch (up) { switch (up) {
case 1: case 1:
case 2: case 2:
@ -1653,7 +1647,7 @@ _func_enter_;
break; break;
} }
_func_exit_;
return ptxservq; return ptxservq;
} }
@ -1672,7 +1666,7 @@ s32 rtw_xmit_classifier(struct adapter *padapter, struct xmit_frame *pxmitframe)
struct hw_xmit *phwxmits = padapter->xmitpriv.hwxmits; struct hw_xmit *phwxmits = padapter->xmitpriv.hwxmits;
int res = _SUCCESS; int res = _SUCCESS;
_func_enter_;
if (pattrib->psta) { if (pattrib->psta) {
psta = pattrib->psta; psta = pattrib->psta;
@ -1697,7 +1691,7 @@ _func_enter_;
phwxmits[ac_index].accnt++; phwxmits[ac_index].accnt++;
exit: exit:
_func_exit_;
return res; return res;
} }
@ -1740,10 +1734,10 @@ void rtw_free_hwxmits(struct adapter *padapter)
void rtw_init_hwxmits(struct hw_xmit *phwxmit, int entry) void rtw_init_hwxmits(struct hw_xmit *phwxmit, int entry)
{ {
int i; int i;
_func_enter_;
for (i = 0; i < entry; i++, phwxmit++) for (i = 0; i < entry; i++, phwxmit++)
phwxmit->accnt = 0; phwxmit->accnt = 0;
_func_exit_;
} }
static int rtw_br_client_tx(struct adapter *padapter, struct sk_buff **pskb) static int rtw_br_client_tx(struct adapter *padapter, struct sk_buff **pskb)

4
hal/hal_intf.c
View file

@ -116,7 +116,7 @@ uint rtw_hal_deinit(struct adapter *adapt)
{ {
uint status = _SUCCESS; uint status = _SUCCESS;
_func_enter_;
status = adapt->HalFunc.hal_deinit(adapt); status = adapt->HalFunc.hal_deinit(adapt);
@ -125,7 +125,7 @@ _func_enter_;
else else
DBG_88E("\n rtw_hal_deinit: hal_init fail\n"); DBG_88E("\n rtw_hal_deinit: hal_init fail\n");
_func_exit_;
return status; return status;
} }

24
hal/rtl8188e_cmd.c
View file

@ -72,7 +72,7 @@ static s32 FillH2CCmd_88E(struct adapter *adapt, u8 ElementID, u32 CmdLen, u8 *p
u32 h2c_cmd_ex = 0; u32 h2c_cmd_ex = 0;
s32 ret = _FAIL; s32 ret = _FAIL;
_func_enter_;
if (!adapt->bFWReady) { if (!adapt->bFWReady) {
DBG_88E("FillH2CCmd_88E(): return H2C cmd because fw is not ready\n"); DBG_88E("FillH2CCmd_88E(): return H2C cmd because fw is not ready\n");
@ -125,7 +125,7 @@ _func_enter_;
exit: exit:
_func_exit_;
return ret; return ret;
} }
@ -134,7 +134,7 @@ u8 rtl8188e_set_rssi_cmd(struct adapter *adapt, u8 *param)
{ {
u8 res = _SUCCESS; u8 res = _SUCCESS;
struct hal_data_8188e *haldata = GET_HAL_DATA(adapt); struct hal_data_8188e *haldata = GET_HAL_DATA(adapt);
_func_enter_;
if (haldata->fw_ractrl) { if (haldata->fw_ractrl) {
; ;
@ -143,7 +143,7 @@ _func_enter_;
res = _FAIL; res = _FAIL;
} }
_func_exit_;
return res; return res;
} }
@ -154,7 +154,7 @@ u8 rtl8188e_set_raid_cmd(struct adapter *adapt, u32 mask)
u8 res = _SUCCESS; u8 res = _SUCCESS;
struct hal_data_8188e *haldata = GET_HAL_DATA(adapt); struct hal_data_8188e *haldata = GET_HAL_DATA(adapt);
_func_enter_;
if (haldata->fw_ractrl) { if (haldata->fw_ractrl) {
__le32 lmask; __le32 lmask;
@ -168,7 +168,7 @@ _func_enter_;
res = _FAIL; res = _FAIL;
} }
_func_exit_;
return res; return res;
} }
@ -215,7 +215,7 @@ void rtl8188e_set_FwPwrMode_cmd(struct adapter *adapt, u8 Mode)
struct setpwrmode_parm H2CSetPwrMode; struct setpwrmode_parm H2CSetPwrMode;
struct pwrctrl_priv *pwrpriv = &adapt->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &adapt->pwrctrlpriv;
u8 RLBM = 0; /* 0:Min, 1:Max, 2:User define */ u8 RLBM = 0; /* 0:Min, 1:Max, 2:User define */
_func_enter_;
DBG_88E("%s: Mode=%d SmartPS=%d UAPSD=%d\n", __func__, DBG_88E("%s: Mode=%d SmartPS=%d UAPSD=%d\n", __func__,
Mode, pwrpriv->smart_ps, adapt->registrypriv.uapsd_enable); Mode, pwrpriv->smart_ps, adapt->registrypriv.uapsd_enable);
@ -256,7 +256,7 @@ _func_enter_;
FillH2CCmd_88E(adapt, H2C_PS_PWR_MODE, sizeof(H2CSetPwrMode), (u8 *)&H2CSetPwrMode); FillH2CCmd_88E(adapt, H2C_PS_PWR_MODE, sizeof(H2CSetPwrMode), (u8 *)&H2CSetPwrMode);
_func_exit_;
} }
void rtl8188e_set_FwMediaStatus_cmd(struct adapter *adapt, __le16 mstatus_rpt) void rtl8188e_set_FwMediaStatus_cmd(struct adapter *adapt, __le16 mstatus_rpt)
@ -617,7 +617,7 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *adapt, u8 mstatus)
u8 DLBcnCount = 0; u8 DLBcnCount = 0;
u32 poll = 0; u32 poll = 0;
_func_enter_;
DBG_88E("%s mstatus(%x)\n", __func__, mstatus); DBG_88E("%s mstatus(%x)\n", __func__, mstatus);
@ -701,7 +701,7 @@ _func_enter_;
haldata->RegCR_1 &= (~BIT0); haldata->RegCR_1 &= (~BIT0);
rtw_write8(adapt, REG_CR+1, haldata->RegCR_1); rtw_write8(adapt, REG_CR+1, haldata->RegCR_1);
} }
_func_exit_;
} }
void rtl8188e_set_p2p_ps_offload_cmd(struct adapter *adapt, u8 p2p_ps_state) void rtl8188e_set_p2p_ps_offload_cmd(struct adapter *adapt, u8 p2p_ps_state)
@ -712,7 +712,7 @@ void rtl8188e_set_p2p_ps_offload_cmd(struct adapter *adapt, u8 p2p_ps_state)
struct P2P_PS_Offload_t *p2p_ps_offload = &haldata->p2p_ps_offload; struct P2P_PS_Offload_t *p2p_ps_offload = &haldata->p2p_ps_offload;
u8 i; u8 i;
_func_enter_;
switch (p2p_ps_state) { switch (p2p_ps_state) {
case P2P_PS_DISABLE: case P2P_PS_DISABLE:
@ -775,5 +775,5 @@ _func_enter_;
FillH2CCmd_88E(adapt, H2C_PS_P2P_OFFLOAD, 1, (u8 *)p2p_ps_offload); FillH2CCmd_88E(adapt, H2C_PS_P2P_OFFLOAD, 1, (u8 *)p2p_ps_offload);
#endif #endif
_func_exit_;
} }

4
hal/rtl8188e_dm.c
View file

@ -165,7 +165,7 @@ void rtl8188e_HalDmWatchDog(struct adapter *Adapter)
u8 hw_init_completed = false; u8 hw_init_completed = false;
struct hal_data_8188e *hal_data = GET_HAL_DATA(Adapter); struct hal_data_8188e *hal_data = GET_HAL_DATA(Adapter);
_func_enter_;
hw_init_completed = Adapter->hw_init_completed; hw_init_completed = Adapter->hw_init_completed;
if (!hw_init_completed) if (!hw_init_completed)
@ -183,7 +183,7 @@ void rtl8188e_HalDmWatchDog(struct adapter *Adapter)
/* Calculate Tx/Rx statistics. */ /* Calculate Tx/Rx statistics. */
dm_CheckStatistics(Adapter); dm_CheckStatistics(Adapter);
_func_exit_;
} }
/* ODM */ /* ODM */

4
hal/rtl8188e_hal_init.c
View file

@ -715,10 +715,10 @@ void rtl8188e_InitializeFirmwareVars(struct adapter *padapter)
static void rtl8188e_free_hal_data(struct adapter *padapter) static void rtl8188e_free_hal_data(struct adapter *padapter)
{ {
_func_enter_;
kfree(padapter->HalData); kfree(padapter->HalData);
padapter->HalData = NULL; padapter->HalData = NULL;
_func_exit_;
} }
/* */ /* */

20
hal/usb_halinit.c
View file

@ -709,7 +709,7 @@ static u32 rtl8188eu_hal_init(struct adapter *Adapter)
#define HAL_INIT_PROFILE_TAG(stage) do {} while (0) #define HAL_INIT_PROFILE_TAG(stage) do {} while (0)
_func_enter_;
HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_BEGIN); HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_BEGIN);
@ -967,7 +967,7 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_END);
DBG_88E("%s in %dms\n", __func__, rtw_get_passing_time_ms(init_start_time)); DBG_88E("%s in %dms\n", __func__, rtw_get_passing_time_ms(init_start_time));
_func_exit_;
return status; return status;
} }
@ -1084,7 +1084,7 @@ static unsigned int rtl8188eu_inirp_init(struct adapter *Adapter)
struct recv_priv *precvpriv = &(Adapter->recvpriv); struct recv_priv *precvpriv = &(Adapter->recvpriv);
u32 (*_read_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem); u32 (*_read_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem);
_func_enter_;
_read_port = pintfhdl->io_ops._read_port; _read_port = pintfhdl->io_ops._read_port;
@ -1112,7 +1112,7 @@ exit:
RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("<=== usb_inirp_init\n")); RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("<=== usb_inirp_init\n"));
_func_exit_;
return status; return status;
} }
@ -1402,7 +1402,7 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
struct hal_data_8188e *haldata = GET_HAL_DATA(Adapter); struct hal_data_8188e *haldata = GET_HAL_DATA(Adapter);
struct dm_priv *pdmpriv = &haldata->dmpriv; struct dm_priv *pdmpriv = &haldata->dmpriv;
struct odm_dm_struct *podmpriv = &haldata->odmpriv; struct odm_dm_struct *podmpriv = &haldata->odmpriv;
_func_enter_;
switch (variable) { switch (variable) {
case HW_VAR_MEDIA_STATUS: case HW_VAR_MEDIA_STATUS:
@ -1921,14 +1921,14 @@ _func_enter_;
default: default:
break; break;
} }
_func_exit_;
} }
static void GetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val) static void GetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
{ {
struct hal_data_8188e *haldata = GET_HAL_DATA(Adapter); struct hal_data_8188e *haldata = GET_HAL_DATA(Adapter);
struct odm_dm_struct *podmpriv = &haldata->odmpriv; struct odm_dm_struct *podmpriv = &haldata->odmpriv;
_func_enter_;
switch (variable) { switch (variable) {
case HW_VAR_BASIC_RATE: case HW_VAR_BASIC_RATE:
@ -1980,7 +1980,7 @@ _func_enter_;
break; break;
} }
_func_exit_;
} }
/* */ /* */
@ -2302,7 +2302,7 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt)
{ {
struct hal_ops *halfunc = &adapt->HalFunc; struct hal_ops *halfunc = &adapt->HalFunc;
_func_enter_;
adapt->HalData = rtw_zmalloc(sizeof(struct hal_data_8188e)); adapt->HalData = rtw_zmalloc(sizeof(struct hal_data_8188e));
if (adapt->HalData == NULL) if (adapt->HalData == NULL)
@ -2342,5 +2342,5 @@ _func_enter_;
halfunc->interface_ps_func = &rtl8188eu_ps_func; halfunc->interface_ps_func = &rtl8188eu_ps_func;
rtl8188e_set_hal_ops(halfunc); rtl8188e_set_hal_ops(halfunc);
_func_exit_;
} }

41
hal/usb_ops_linux.c
View file

@ -125,7 +125,7 @@ static u8 usb_read8(struct intf_hdl *pintfhdl, u32 addr)
u16 len; u16 len;
u8 data = 0; u8 data = 0;
_func_enter_;
request = 0x05; request = 0x05;
requesttype = 0x01;/* read_in */ requesttype = 0x01;/* read_in */
@ -136,7 +136,7 @@ static u8 usb_read8(struct intf_hdl *pintfhdl, u32 addr)
usbctrl_vendorreq(pintfhdl, request, wvalue, index, &data, len, requesttype); usbctrl_vendorreq(pintfhdl, request, wvalue, index, &data, len, requesttype);
_func_exit_;
return data; return data;
@ -151,14 +151,14 @@ static u16 usb_read16(struct intf_hdl *pintfhdl, u32 addr)
u16 len; u16 len;
__le32 data; __le32 data;
_func_enter_;
request = 0x05; request = 0x05;
requesttype = 0x01;/* read_in */ requesttype = 0x01;/* read_in */
index = 0;/* n/a */ index = 0;/* n/a */
wvalue = (u16)(addr&0x0000ffff); wvalue = (u16)(addr&0x0000ffff);
len = 2; len = 2;
usbctrl_vendorreq(pintfhdl, request, wvalue, index, &data, len, requesttype); usbctrl_vendorreq(pintfhdl, request, wvalue, index, &data, len, requesttype);
_func_exit_;
return (u16)(le32_to_cpu(data)&0xffff); return (u16)(le32_to_cpu(data)&0xffff);
} }
@ -172,7 +172,7 @@ static u32 usb_read32(struct intf_hdl *pintfhdl, u32 addr)
u16 len; u16 len;
__le32 data; __le32 data;
_func_enter_;
request = 0x05; request = 0x05;
requesttype = 0x01;/* read_in */ requesttype = 0x01;/* read_in */
@ -183,7 +183,7 @@ _func_enter_;
usbctrl_vendorreq(pintfhdl, request, wvalue, index, &data, len, requesttype); usbctrl_vendorreq(pintfhdl, request, wvalue, index, &data, len, requesttype);
_func_exit_;
return le32_to_cpu(data); return le32_to_cpu(data);
} }
@ -198,7 +198,7 @@ static int usb_write8(struct intf_hdl *pintfhdl, u32 addr, u8 val)
u8 data; u8 data;
int ret; int ret;
_func_enter_;
request = 0x05; request = 0x05;
requesttype = 0x00;/* write_out */ requesttype = 0x00;/* write_out */
index = 0;/* n/a */ index = 0;/* n/a */
@ -206,7 +206,7 @@ static int usb_write8(struct intf_hdl *pintfhdl, u32 addr, u8 val)
len = 1; len = 1;
data = val; data = val;
ret = usbctrl_vendorreq(pintfhdl, request, wvalue, index, &data, len, requesttype); ret = usbctrl_vendorreq(pintfhdl, request, wvalue, index, &data, len, requesttype);
_func_exit_;
return ret; return ret;
} }
@ -220,7 +220,7 @@ static int usb_write16(struct intf_hdl *pintfhdl, u32 addr, u16 val)
__le32 data; __le32 data;
int ret; int ret;
_func_enter_;
request = 0x05; request = 0x05;
requesttype = 0x00;/* write_out */ requesttype = 0x00;/* write_out */
@ -233,7 +233,7 @@ static int usb_write16(struct intf_hdl *pintfhdl, u32 addr, u16 val)
ret = usbctrl_vendorreq(pintfhdl, request, wvalue, index, &data, len, requesttype); ret = usbctrl_vendorreq(pintfhdl, request, wvalue, index, &data, len, requesttype);
_func_exit_;
return ret; return ret;
} }
@ -248,7 +248,7 @@ static int usb_write32(struct intf_hdl *pintfhdl, u32 addr, u32 val)
__le32 data; __le32 data;
int ret; int ret;
_func_enter_;
request = 0x05; request = 0x05;
requesttype = 0x00;/* write_out */ requesttype = 0x00;/* write_out */
@ -260,7 +260,7 @@ static int usb_write32(struct intf_hdl *pintfhdl, u32 addr, u32 val)
ret = usbctrl_vendorreq(pintfhdl, request, wvalue, index, &data, len, requesttype); ret = usbctrl_vendorreq(pintfhdl, request, wvalue, index, &data, len, requesttype);
_func_exit_;
return ret; return ret;
} }
@ -275,7 +275,7 @@ static int usb_writeN(struct intf_hdl *pintfhdl, u32 addr, u32 length, u8 *pdata
u8 buf[VENDOR_CMD_MAX_DATA_LEN] = {0}; u8 buf[VENDOR_CMD_MAX_DATA_LEN] = {0};
int ret; int ret;
_func_enter_;
request = 0x05; request = 0x05;
requesttype = 0x00;/* write_out */ requesttype = 0x00;/* write_out */
@ -287,7 +287,7 @@ static int usb_writeN(struct intf_hdl *pintfhdl, u32 addr, u32 length, u8 *pdata
ret = usbctrl_vendorreq(pintfhdl, request, wvalue, index, buf, len, requesttype); ret = usbctrl_vendorreq(pintfhdl, request, wvalue, index, buf, len, requesttype);
_func_exit_;
return ret; return ret;
} }
@ -519,7 +519,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
DBG_88E("%s() RX Warning! bDriverStopped(%d) OR bSurpriseRemoved(%d) bReadPortCancel(%d)\n", DBG_88E("%s() RX Warning! bDriverStopped(%d) OR bSurpriseRemoved(%d) bReadPortCancel(%d)\n",
__func__, adapt->bDriverStopped, __func__, adapt->bDriverStopped,
adapt->bSurpriseRemoved, adapt->bReadPortCancel); adapt->bSurpriseRemoved, adapt->bReadPortCancel);
goto exit; return;
} }
if (purb->status == 0) { /* SUCCESS */ if (purb->status == 0) { /* SUCCESS */
@ -579,9 +579,6 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
break; break;
} }
} }
exit:
_func_exit_;
} }
static u32 usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem) static u32 usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem)
@ -598,7 +595,7 @@ static u32 usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem)
size_t alignment = 0; size_t alignment = 0;
u32 ret = _SUCCESS; u32 ret = _SUCCESS;
_func_enter_;
if (adapter->bDriverStopped || adapter->bSurpriseRemoved || if (adapter->bDriverStopped || adapter->bSurpriseRemoved ||
adapter->pwrctrlpriv.pnp_bstop_trx) { adapter->pwrctrlpriv.pnp_bstop_trx) {
@ -672,7 +669,7 @@ _func_enter_;
ret = _FAIL; ret = _FAIL;
} }
_func_exit_;
return ret; return ret;
} }
@ -702,7 +699,7 @@ void rtl8188eu_xmit_tasklet(void *priv)
void rtl8188eu_set_intf_ops(struct _io_ops *pops) void rtl8188eu_set_intf_ops(struct _io_ops *pops)
{ {
_func_enter_;
_rtw_memset((u8 *)pops, 0, sizeof(struct _io_ops)); _rtw_memset((u8 *)pops, 0, sizeof(struct _io_ops));
pops->_read8 = &usb_read8; pops->_read8 = &usb_read8;
pops->_read16 = &usb_read16; pops->_read16 = &usb_read16;
@ -717,7 +714,7 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops)
pops->_write_port = &usb_write_port; pops->_write_port = &usb_write_port;
pops->_read_port_cancel = &usb_read_port_cancel; pops->_read_port_cancel = &usb_read_port_cancel;
pops->_write_port_cancel = &usb_write_port_cancel; pops->_write_port_cancel = &usb_write_port_cancel;
_func_exit_;
} }
void rtl8188eu_set_hw_type(struct adapter *adapt) void rtl8188eu_set_hw_type(struct adapter *adapt)

14
include/rtw_debug.h
View file

@ -99,20 +99,6 @@ extern u32 GlobalDebugLevel;
} \ } \
} while (0) } while (0)
#define _func_enter_ \
do { \
if (GlobalDebugLevel >= _drv_debug_) \
pr_info("%s : %s enters at %d\n", \
DRIVER_PREFIX, __func__, __LINE__); \
} while (0)
#define _func_exit_ \
do { \
if (GlobalDebugLevel >= _drv_debug_) \
pr_info("%s : %s exits at %d\n", \
DRIVER_PREFIX, __func__, __LINE__); \
} while (0)
#define RT_PRINT_DATA(_comp, _level, _titlestring, _hexdata, _hexdatalen)\ #define RT_PRINT_DATA(_comp, _level, _titlestring, _hexdata, _hexdatalen)\
do { \ do { \
if (_level <= GlobalDebugLevel) { \ if (_level <= GlobalDebugLevel) { \

2
include/rtw_ioctl.h
View file

@ -102,8 +102,6 @@ struct oid_obj_priv {
#if defined(_RTW_MP_IOCTL_C_) #if defined(_RTW_MP_IOCTL_C_)
static int oid_null_function(struct oid_par_priv *poid_par_priv) { static int oid_null_function(struct oid_par_priv *poid_par_priv) {
_func_enter_;
_func_exit_;
return NDIS_STATUS_SUCCESS; return NDIS_STATUS_SUCCESS;
} }
#endif #endif

76
os_dep/ioctl_linux.c
View file

@ -472,7 +472,7 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,
struct wifidirect_info *pwdinfo = &padapter->wdinfo; struct wifidirect_info *pwdinfo = &padapter->wdinfo;
#endif /* CONFIG_88EU_P2P */ #endif /* CONFIG_88EU_P2P */
_func_enter_;
param->u.crypt.err = 0; param->u.crypt.err = 0;
param->u.crypt.alg[IEEE_CRYPT_ALG_NAME_LEN - 1] = '\0'; param->u.crypt.alg[IEEE_CRYPT_ALG_NAME_LEN - 1] = '\0';
@ -615,7 +615,7 @@ exit:
kfree(pwep); kfree(pwep);
_func_exit_;
return ret; return ret;
} }
@ -770,7 +770,7 @@ static int rtw_wx_get_name(struct net_device *dev,
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("cmd_code =%x\n", info->cmd)); RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("cmd_code =%x\n", info->cmd));
_func_enter_;
if (check_fwstate(pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE) == true) { if (check_fwstate(pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE) == true) {
/* parsing HT_CAP_IE */ /* parsing HT_CAP_IE */
@ -807,7 +807,7 @@ static int rtw_wx_get_name(struct net_device *dev,
snprintf(wrqu->name, IFNAMSIZ, "unassociated"); snprintf(wrqu->name, IFNAMSIZ, "unassociated");
} }
_func_exit_;
return 0; return 0;
} }
@ -816,11 +816,11 @@ static int rtw_wx_set_freq(struct net_device *dev,
struct iw_request_info *info, struct iw_request_info *info,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
{ {
_func_enter_;
RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, ("+rtw_wx_set_freq\n")); RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, ("+rtw_wx_set_freq\n"));
_func_exit_;
return 0; return 0;
} }
@ -854,7 +854,7 @@ static int rtw_wx_set_mode(struct net_device *dev, struct iw_request_info *a,
enum ndis_802_11_network_infra networkType; enum ndis_802_11_network_infra networkType;
int ret = 0; int ret = 0;
_func_enter_;
if (_FAIL == rtw_pwr_wakeup(padapter)) { if (_FAIL == rtw_pwr_wakeup(padapter)) {
ret = -EPERM; ret = -EPERM;
@ -894,7 +894,7 @@ static int rtw_wx_set_mode(struct net_device *dev, struct iw_request_info *a,
} }
rtw_setopmode_cmd(padapter, networkType); rtw_setopmode_cmd(padapter, networkType);
exit: exit:
_func_exit_;
return ret; return ret;
} }
@ -906,7 +906,7 @@ static int rtw_wx_get_mode(struct net_device *dev, struct iw_request_info *a,
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, (" rtw_wx_get_mode\n")); RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, (" rtw_wx_get_mode\n"));
_func_enter_;
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) if (check_fwstate(pmlmepriv, WIFI_STATION_STATE))
wrqu->mode = IW_MODE_INFRA; wrqu->mode = IW_MODE_INFRA;
@ -918,7 +918,7 @@ static int rtw_wx_get_mode(struct net_device *dev, struct iw_request_info *a,
else else
wrqu->mode = IW_MODE_AUTO; wrqu->mode = IW_MODE_AUTO;
_func_exit_;
return 0; return 0;
} }
@ -1011,7 +1011,7 @@ static int rtw_wx_get_range(struct net_device *dev,
u16 val; u16 val;
int i; int i;
_func_enter_;
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("rtw_wx_get_range. cmd_code =%x\n", info->cmd)); RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("rtw_wx_get_range. cmd_code =%x\n", info->cmd));
@ -1093,7 +1093,7 @@ static int rtw_wx_get_range(struct net_device *dev,
range->scan_capa = IW_SCAN_CAPA_ESSID | IW_SCAN_CAPA_TYPE | range->scan_capa = IW_SCAN_CAPA_ESSID | IW_SCAN_CAPA_TYPE |
IW_SCAN_CAPA_BSSID | IW_SCAN_CAPA_CHANNEL | IW_SCAN_CAPA_BSSID | IW_SCAN_CAPA_CHANNEL |
IW_SCAN_CAPA_MODE | IW_SCAN_CAPA_RATE; IW_SCAN_CAPA_MODE | IW_SCAN_CAPA_RATE;
_func_exit_;
return 0; return 0;
} }
@ -1118,7 +1118,7 @@ static int rtw_wx_set_wap(struct net_device *dev,
struct wlan_network *pnetwork = NULL; struct wlan_network *pnetwork = NULL;
enum ndis_802_11_auth_mode authmode; enum ndis_802_11_auth_mode authmode;
_func_enter_;
if (_FAIL == rtw_pwr_wakeup(padapter)) { if (_FAIL == rtw_pwr_wakeup(padapter)) {
ret = -1; ret = -1;
@ -1173,7 +1173,7 @@ static int rtw_wx_set_wap(struct net_device *dev,
exit: exit:
_func_exit_;
return ret; return ret;
} }
@ -1192,7 +1192,7 @@ static int rtw_wx_get_wap(struct net_device *dev,
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("rtw_wx_get_wap\n")); RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("rtw_wx_get_wap\n"));
_func_enter_;
if (((check_fwstate(pmlmepriv, _FW_LINKED)) == true) || if (((check_fwstate(pmlmepriv, _FW_LINKED)) == true) ||
((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) == true) || ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) == true) ||
@ -1201,7 +1201,7 @@ static int rtw_wx_get_wap(struct net_device *dev,
else else
_rtw_memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN); _rtw_memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN);
_func_exit_;
return 0; return 0;
} }
@ -1252,7 +1252,7 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a,
#endif /* CONFIG_88EU_P2P */ #endif /* CONFIG_88EU_P2P */
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("rtw_wx_set_scan\n")); RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("rtw_wx_set_scan\n"));
_func_enter_;
if (padapter->registrypriv.mp_mode == 1) { if (padapter->registrypriv.mp_mode == 1) {
if (check_fwstate(pmlmepriv, WIFI_MP_STATE)) { if (check_fwstate(pmlmepriv, WIFI_MP_STATE)) {
ret = -1; ret = -1;
@ -1383,7 +1383,7 @@ _func_enter_;
exit: exit:
_func_exit_;
return ret; return ret;
} }
@ -1407,7 +1407,7 @@ static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a,
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("rtw_wx_get_scan\n")); RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("rtw_wx_get_scan\n"));
RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_info_, (" Start of Query SIOCGIWSCAN .\n")); RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_info_, (" Start of Query SIOCGIWSCAN .\n"));
_func_enter_;
if (padapter->pwrctrlpriv.brfoffbyhw && padapter->bDriverStopped) { if (padapter->pwrctrlpriv.brfoffbyhw && padapter->bDriverStopped) {
ret = -EINVAL; ret = -EINVAL;
@ -1466,7 +1466,7 @@ static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a,
wrqu->data.flags = 0; wrqu->data.flags = 0;
exit: exit:
_func_exit_;
return ret; return ret;
} }
@ -1490,7 +1490,7 @@ static int rtw_wx_set_essid(struct net_device *dev,
uint ret = 0, len; uint ret = 0, len;
_func_enter_;
RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_info_, RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_info_,
("+rtw_wx_set_essid: fw_state = 0x%08x\n", get_fwstate(pmlmepriv))); ("+rtw_wx_set_essid: fw_state = 0x%08x\n", get_fwstate(pmlmepriv)));
@ -1583,7 +1583,7 @@ exit:
DBG_88E("<=%s, ret %d\n", __func__, ret); DBG_88E("<=%s, ret %d\n", __func__, ret);
_func_exit_;
return ret; return ret;
} }
@ -1599,7 +1599,7 @@ static int rtw_wx_get_essid(struct net_device *dev,
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("rtw_wx_get_essid\n")); RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("rtw_wx_get_essid\n"));
_func_enter_;
if ((check_fwstate(pmlmepriv, _FW_LINKED)) || if ((check_fwstate(pmlmepriv, _FW_LINKED)) ||
(check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE))) { (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE))) {
@ -1617,7 +1617,7 @@ static int rtw_wx_get_essid(struct net_device *dev,
exit: exit:
_func_exit_;
return ret; return ret;
} }
@ -1634,7 +1634,7 @@ static int rtw_wx_set_rate(struct net_device *dev,
u32 ratevalue = 0; u32 ratevalue = 0;
u8 mpdatarate[NumRates] = {11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0xff}; u8 mpdatarate[NumRates] = {11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0xff};
_func_enter_;
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, (" rtw_wx_set_rate\n")); RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, (" rtw_wx_set_rate\n"));
RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_info_, ("target_rate = %d, fixed = %d\n", target_rate, fixed)); RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_info_, ("target_rate = %d, fixed = %d\n", target_rate, fixed));
@ -1706,7 +1706,7 @@ set_rate:
ret = -1; ret = -1;
} }
_func_exit_;
return ret; return ret;
} }
@ -1734,7 +1734,7 @@ static int rtw_wx_set_rts(struct net_device *dev,
{ {
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
_func_enter_;
if (wrqu->rts.disabled) { if (wrqu->rts.disabled) {
padapter->registrypriv.rts_thresh = 2347; padapter->registrypriv.rts_thresh = 2347;
@ -1748,7 +1748,7 @@ static int rtw_wx_set_rts(struct net_device *dev,
DBG_88E("%s, rts_thresh =%d\n", __func__, padapter->registrypriv.rts_thresh); DBG_88E("%s, rts_thresh =%d\n", __func__, padapter->registrypriv.rts_thresh);
_func_exit_;
return 0; return 0;
} }
@ -1759,7 +1759,7 @@ static int rtw_wx_get_rts(struct net_device *dev,
{ {
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
_func_enter_;
DBG_88E("%s, rts_thresh =%d\n", __func__, padapter->registrypriv.rts_thresh); DBG_88E("%s, rts_thresh =%d\n", __func__, padapter->registrypriv.rts_thresh);
@ -1767,7 +1767,7 @@ static int rtw_wx_get_rts(struct net_device *dev,
wrqu->rts.fixed = 0; /* no auto select */ wrqu->rts.fixed = 0; /* no auto select */
/* wrqu->rts.disabled = (wrqu->rts.value == DEFAULT_RTS_THRESHOLD); */ /* wrqu->rts.disabled = (wrqu->rts.value == DEFAULT_RTS_THRESHOLD); */
_func_exit_;
return 0; return 0;
} }
@ -1778,7 +1778,7 @@ static int rtw_wx_set_frag(struct net_device *dev,
{ {
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
_func_enter_;
if (wrqu->frag.disabled) { if (wrqu->frag.disabled) {
padapter->xmitpriv.frag_len = MAX_FRAG_THRESHOLD; padapter->xmitpriv.frag_len = MAX_FRAG_THRESHOLD;
@ -1792,7 +1792,7 @@ static int rtw_wx_set_frag(struct net_device *dev,
DBG_88E("%s, frag_len =%d\n", __func__, padapter->xmitpriv.frag_len); DBG_88E("%s, frag_len =%d\n", __func__, padapter->xmitpriv.frag_len);
_func_exit_;
return 0; return 0;
} }
@ -1803,14 +1803,14 @@ static int rtw_wx_get_frag(struct net_device *dev,
{ {
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
_func_enter_;
DBG_88E("%s, frag_len =%d\n", __func__, padapter->xmitpriv.frag_len); DBG_88E("%s, frag_len =%d\n", __func__, padapter->xmitpriv.frag_len);
wrqu->frag.value = padapter->xmitpriv.frag_len; wrqu->frag.value = padapter->xmitpriv.frag_len;
wrqu->frag.fixed = 0; /* no auto select */ wrqu->frag.fixed = 0; /* no auto select */
_func_exit_;
return 0; return 0;
} }
@ -1844,7 +1844,7 @@ static int rtw_wx_set_enc(struct net_device *dev,
key = erq->flags & IW_ENCODE_INDEX; key = erq->flags & IW_ENCODE_INDEX;
_func_enter_;
if (erq->flags & IW_ENCODE_DISABLED) { if (erq->flags & IW_ENCODE_DISABLED) {
DBG_88E("EncryptionDisabled\n"); DBG_88E("EncryptionDisabled\n");
@ -1939,7 +1939,7 @@ static int rtw_wx_set_enc(struct net_device *dev,
exit: exit:
_func_exit_;
return ret; return ret;
} }
@ -1953,7 +1953,7 @@ static int rtw_wx_get_enc(struct net_device *dev,
struct iw_point *erq = &(wrqu->encoding); struct iw_point *erq = &(wrqu->encoding);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
_func_enter_;
if (check_fwstate(pmlmepriv, _FW_LINKED) != true) { if (check_fwstate(pmlmepriv, _FW_LINKED) != true) {
if (!check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) { if (!check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) {
@ -2007,7 +2007,7 @@ static int rtw_wx_get_enc(struct net_device *dev,
erq->flags |= IW_ENCODE_DISABLED; erq->flags |= IW_ENCODE_DISABLED;
break; break;
} }
_func_exit_;
return ret; return ret;
} }

13
os_dep/mlme_linux.c
View file

@ -61,12 +61,12 @@ void rtw_init_mlme_timer(struct adapter *padapter)
void rtw_os_indicate_connect(struct adapter *adapter) void rtw_os_indicate_connect(struct adapter *adapter)
{ {
_func_enter_;
rtw_indicate_wx_assoc_event(adapter); rtw_indicate_wx_assoc_event(adapter);
netif_carrier_on(adapter->pnetdev); netif_carrier_on(adapter->pnetdev);
if (adapter->pid[2] != 0) if (adapter->pid[2] != 0)
rtw_signal_process(adapter->pid[2], SIGALRM); rtw_signal_process(adapter->pid[2], SIGALRM);
_func_exit_;
} }
void rtw_os_indicate_scan_done(struct adapter *padapter, bool aborted) void rtw_os_indicate_scan_done(struct adapter *padapter, bool aborted)
@ -119,11 +119,11 @@ void rtw_reset_securitypriv(struct adapter *adapter)
void rtw_os_indicate_disconnect(struct adapter *adapter) void rtw_os_indicate_disconnect(struct adapter *adapter)
{ {
_func_enter_;
netif_carrier_off(adapter->pnetdev); /* Do it first for tx broadcast pkt after disconnection issue! */ netif_carrier_off(adapter->pnetdev); /* Do it first for tx broadcast pkt after disconnection issue! */
rtw_indicate_wx_disassoc_event(adapter); rtw_indicate_wx_disassoc_event(adapter);
rtw_reset_securitypriv(adapter); rtw_reset_securitypriv(adapter);
_func_exit_;
} }
void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *sec_ie) void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *sec_ie)
@ -132,7 +132,6 @@ void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *sec_ie)
u8 *buff, *p, i; u8 *buff, *p, i;
union iwreq_data wrqu; union iwreq_data wrqu;
_func_enter_;
RT_TRACE(_module_mlme_osdep_c_, _drv_info_, RT_TRACE(_module_mlme_osdep_c_, _drv_info_,
("+rtw_report_sec_ie, authmode=%d\n", authmode)); ("+rtw_report_sec_ie, authmode=%d\n", authmode));
buff = NULL; buff = NULL;
@ -141,7 +140,7 @@ _func_enter_;
("rtw_report_sec_ie, authmode=%d\n", authmode)); ("rtw_report_sec_ie, authmode=%d\n", authmode));
buff = rtw_malloc(IW_CUSTOM_MAX); buff = rtw_malloc(IW_CUSTOM_MAX);
if (!buff) if (!buff)
goto exit; return;
_rtw_memset(buff, 0, IW_CUSTOM_MAX); _rtw_memset(buff, 0, IW_CUSTOM_MAX);
p = buff; p = buff;
p += sprintf(p, "ASSOCINFO(ReqIEs ="); p += sprintf(p, "ASSOCINFO(ReqIEs =");
@ -157,8 +156,6 @@ _func_enter_;
wireless_send_event(adapter->pnetdev, IWEVCUSTOM, &wrqu, buff); wireless_send_event(adapter->pnetdev, IWEVCUSTOM, &wrqu, buff);
kfree(buff); kfree(buff);
} }
exit:
_func_exit_;
} }
static void _survey_timer_hdl(void *FunctionContext) static void _survey_timer_hdl(void *FunctionContext)

8
os_dep/os_intfs.c
View file

@ -522,7 +522,7 @@ static uint loadparam(struct adapter *padapter, struct net_device *pnetdev)
uint status = _SUCCESS; uint status = _SUCCESS;
struct registry_priv *registry_par = &padapter->registrypriv; struct registry_priv *registry_par = &padapter->registrypriv;
_func_enter_;
GlobalDebugLevel = rtw_debug; GlobalDebugLevel = rtw_debug;
registry_par->chip_version = (u8)rtw_chip_version; registry_par->chip_version = (u8)rtw_chip_version;
@ -590,7 +590,7 @@ _func_enter_;
snprintf(registry_par->ifname, 16, "%s", ifname); snprintf(registry_par->ifname, 16, "%s", ifname);
snprintf(registry_par->if2name, 16, "%s", if2name); snprintf(registry_par->if2name, 16, "%s", if2name);
registry_par->notch_filter = (u8)rtw_notch_filter; registry_par->notch_filter = (u8)rtw_notch_filter;
_func_exit_;
return status; return status;
} }
@ -868,7 +868,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter)
u8 ret8 = _SUCCESS; u8 ret8 = _SUCCESS;
unsigned long flags; unsigned long flags;
_func_enter_;
RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+rtw_init_drv_sw\n")); RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+rtw_init_drv_sw\n"));
@ -943,7 +943,7 @@ _func_enter_;
exit: exit:
RT_TRACE(_module_os_intfs_c_, _drv_info_, ("-rtw_init_drv_sw\n")); RT_TRACE(_module_os_intfs_c_, _drv_info_, ("-rtw_init_drv_sw\n"));
_func_exit_;
return ret8; return ret8;
} }

6
os_dep/recv_linux.c
View file

@ -130,7 +130,7 @@ int rtw_recv_indicatepkt(struct adapter *padapter,
struct sk_buff *skb; struct sk_buff *skb;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_func_enter_;
precvpriv = &(padapter->recvpriv); precvpriv = &(padapter->recvpriv);
pfree_recv_queue = &(precvpriv->free_recv_queue); pfree_recv_queue = &(precvpriv->free_recv_queue);
@ -220,7 +220,7 @@ _recv_indicatepkt_end:
RT_TRACE(_module_recv_osdep_c_, _drv_info_, RT_TRACE(_module_recv_osdep_c_, _drv_info_,
("\n rtw_recv_indicatepkt :after netif_rx!!!!\n")); ("\n rtw_recv_indicatepkt :after netif_rx!!!!\n"));
_func_exit_;
return _SUCCESS; return _SUCCESS;
@ -229,7 +229,7 @@ _recv_indicatepkt_drop:
/* enqueue back to free_recv_queue */ /* enqueue back to free_recv_queue */
rtw_free_recvframe(precv_frame, pfree_recv_queue); rtw_free_recvframe(precv_frame, pfree_recv_queue);
_func_exit_;
return _FAIL; return _FAIL;
} }

33
os_dep/usb_intf.c
View file

@ -164,7 +164,6 @@ static struct dvobj_priv *usb_dvobj_init(struct usb_interface *usb_intf)
struct usb_endpoint_descriptor *pendp_desc; struct usb_endpoint_descriptor *pendp_desc;
struct usb_device *pusbd; struct usb_device *pusbd;
_func_enter_;
pdvobjpriv = (struct dvobj_priv *)rtw_zmalloc(sizeof(*pdvobjpriv)); pdvobjpriv = (struct dvobj_priv *)rtw_zmalloc(sizeof(*pdvobjpriv));
if (pdvobjpriv == NULL) if (pdvobjpriv == NULL)
@ -237,7 +236,6 @@ free_dvobj:
pdvobjpriv = NULL; pdvobjpriv = NULL;
} }
exit: exit:
_func_exit_;
return pdvobjpriv; return pdvobjpriv;
} }
@ -245,14 +243,13 @@ static void usb_dvobj_deinit(struct usb_interface *usb_intf)
{ {
struct dvobj_priv *dvobj = usb_get_intfdata(usb_intf); struct dvobj_priv *dvobj = usb_get_intfdata(usb_intf);
_func_enter_;
usb_set_intfdata(usb_intf, NULL); usb_set_intfdata(usb_intf, NULL);
if (dvobj) { if (dvobj) {
/* Modify condition for 92DU DMDP 2010.11.18, by Thomas */ /* Modify condition for 92DU DMDP 2010.11.18, by Thomas */
if ((dvobj->NumInterfaces != 2 && if ((dvobj->NumInterfaces != 2 &&
dvobj->NumInterfaces != 3) || dvobj->NumInterfaces != 3) ||
(dvobj->InterfaceNumber == 1)) { (dvobj->InterfaceNumber == 1)) {
if (interface_to_usbdev(usb_intf)->state != if (interface_to_usbdev(usb_intf)->state !=
USB_STATE_NOTATTACHED) { USB_STATE_NOTATTACHED) {
/* If we didn't unplug usb dongle and /* If we didn't unplug usb dongle and
@ -270,7 +267,6 @@ _func_enter_;
usb_put_dev(interface_to_usbdev(usb_intf)); usb_put_dev(interface_to_usbdev(usb_intf));
_func_exit_;
} }
static void chip_by_usb_id(struct adapter *padapter, static void chip_by_usb_id(struct adapter *padapter,
@ -372,8 +368,7 @@ int rtw_hw_suspend(struct adapter *padapter)
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
struct net_device *pnetdev = padapter->pnetdev; struct net_device *pnetdev = padapter->pnetdev;
_func_enter_;
if ((!padapter->bup) || (padapter->bDriverStopped) || if ((!padapter->bup) || (padapter->bDriverStopped) ||
(padapter->bSurpriseRemoved)) { (padapter->bSurpriseRemoved)) {
DBG_88E("padapter->bup=%d bDriverStopped=%d bSurpriseRemoved = %d\n", DBG_88E("padapter->bup=%d bDriverStopped=%d bSurpriseRemoved = %d\n",
@ -425,8 +420,7 @@ int rtw_hw_suspend(struct adapter *padapter)
} else { } else {
goto error_exit; goto error_exit;
} }
_func_exit_; return 0;
return 0;
error_exit: error_exit:
DBG_88E("%s, failed\n", __func__); DBG_88E("%s, failed\n", __func__);
@ -438,8 +432,7 @@ int rtw_hw_resume(struct adapter *padapter)
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
struct net_device *pnetdev = padapter->pnetdev; struct net_device *pnetdev = padapter->pnetdev;
_func_enter_;
if (padapter) { /* system resume */ if (padapter) { /* system resume */
DBG_88E("==> rtw_hw_resume\n"); DBG_88E("==> rtw_hw_resume\n");
_enter_pwrlock(&pwrpriv->lock); _enter_pwrlock(&pwrpriv->lock);
@ -470,8 +463,7 @@ int rtw_hw_resume(struct adapter *padapter)
goto error_exit; goto error_exit;
} }
_func_exit_;
return 0; return 0;
error_exit: error_exit:
DBG_88E("%s, Open net dev failed\n", __func__); DBG_88E("%s, Open net dev failed\n", __func__);
@ -489,8 +481,7 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
int ret = 0; int ret = 0;
u32 start_time = rtw_get_current_time(); u32 start_time = rtw_get_current_time();
_func_enter_;
DBG_88E("==> %s (%s:%d)\n", __func__, current->comm, current->pid); DBG_88E("==> %s (%s:%d)\n", __func__, current->comm, current->pid);
if ((!padapter->bup) || (padapter->bDriverStopped) || if ((!padapter->bup) || (padapter->bDriverStopped) ||
@ -546,8 +537,7 @@ exit:
DBG_88E("<=== %s return %d.............. in %dms\n", __func__ DBG_88E("<=== %s return %d.............. in %dms\n", __func__
, ret, rtw_get_passing_time_ms(start_time)); , ret, rtw_get_passing_time_ms(start_time));
_func_exit_; return ret;
return ret;
} }
static int rtw_resume(struct usb_interface *pusb_intf) static int rtw_resume(struct usb_interface *pusb_intf)
@ -570,8 +560,7 @@ int rtw_resume_process(struct adapter *padapter)
struct pwrctrl_priv *pwrpriv = NULL; struct pwrctrl_priv *pwrpriv = NULL;
int ret = -1; int ret = -1;
u32 start_time = rtw_get_current_time(); u32 start_time = rtw_get_current_time();
_func_enter_;
DBG_88E("==> %s (%s:%d)\n", __func__, current->comm, current->pid); DBG_88E("==> %s (%s:%d)\n", __func__, current->comm, current->pid);
if (padapter) { if (padapter) {
@ -609,8 +598,7 @@ exit:
DBG_88E("<=== %s return %d.............. in %dms\n", __func__, DBG_88E("<=== %s return %d.............. in %dms\n", __func__,
ret, rtw_get_passing_time_ms(start_time)); ret, rtw_get_passing_time_ms(start_time));
_func_exit_;
return ret; return ret;
} }
@ -819,8 +807,6 @@ static void rtw_dev_remove(struct usb_interface *pusb_intf)
struct dvobj_priv *dvobj = usb_get_intfdata(pusb_intf); struct dvobj_priv *dvobj = usb_get_intfdata(pusb_intf);
struct adapter *padapter = dvobj->if1; struct adapter *padapter = dvobj->if1;
_func_enter_;
DBG_88E("+rtw_dev_remove\n"); DBG_88E("+rtw_dev_remove\n");
RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+dev_remove()\n")); RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+dev_remove()\n"));
@ -838,7 +824,6 @@ _func_enter_;
RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("-dev_remove()\n")); RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("-dev_remove()\n"));
DBG_88E("-r871xu_dev_remove, done\n"); DBG_88E("-r871xu_dev_remove, done\n");
_func_exit_;
return; return;
} }

8
os_dep/usb_ops_linux.c
View file

@ -80,7 +80,7 @@ static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs)
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
struct hal_data_8188e *haldata; struct hal_data_8188e *haldata;
_func_enter_;
switch (pxmitbuf->flags) { switch (pxmitbuf->flags) {
case VO_QUEUE_INX: case VO_QUEUE_INX:
@ -157,7 +157,7 @@ check_completion:
tasklet_hi_schedule(&pxmitpriv->xmit_tasklet); tasklet_hi_schedule(&pxmitpriv->xmit_tasklet);
_func_exit_;
} }
u32 usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem) u32 usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem)
@ -174,7 +174,7 @@ u32 usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem)
struct xmit_frame *pxmitframe = (struct xmit_frame *)pxmitbuf->priv_data; struct xmit_frame *pxmitframe = (struct xmit_frame *)pxmitbuf->priv_data;
struct usb_device *pusbd = pdvobj->pusbdev; struct usb_device *pusbd = pdvobj->pusbdev;
_func_enter_;
RT_TRACE(_module_hci_ops_os_c_, _drv_err_, ("+usb_write_port\n")); RT_TRACE(_module_hci_ops_os_c_, _drv_err_, ("+usb_write_port\n"));
@ -255,7 +255,7 @@ _func_enter_;
exit: exit:
if (ret != _SUCCESS) if (ret != _SUCCESS)
rtw_free_xmitbuf(pxmitpriv, pxmitbuf); rtw_free_xmitbuf(pxmitpriv, pxmitbuf);
_func_exit_;
return ret; return ret;
} }

18
os_dep/xmit_linux.c
View file

@ -39,7 +39,7 @@ uint rtw_remainder_len(struct pkt_file *pfile)
void _rtw_open_pktfile(struct sk_buff *pktptr, struct pkt_file *pfile) void _rtw_open_pktfile(struct sk_buff *pktptr, struct pkt_file *pfile)
{ {
_func_enter_;
pfile->pkt = pktptr; pfile->pkt = pktptr;
pfile->cur_addr = pktptr->data; pfile->cur_addr = pktptr->data;
@ -49,14 +49,14 @@ _func_enter_;
pfile->cur_buffer = pfile->buf_start; pfile->cur_buffer = pfile->buf_start;
_func_exit_;
} }
uint _rtw_pktfile_read (struct pkt_file *pfile, u8 *rmem, uint rlen) uint _rtw_pktfile_read (struct pkt_file *pfile, u8 *rmem, uint rlen)
{ {
uint len = 0; uint len = 0;
_func_enter_;
len = rtw_remainder_len(pfile); len = rtw_remainder_len(pfile);
len = (rlen > len) ? len : rlen; len = (rlen > len) ? len : rlen;
@ -67,21 +67,21 @@ _func_enter_;
pfile->cur_addr += len; pfile->cur_addr += len;
pfile->pkt_len -= len; pfile->pkt_len -= len;
_func_exit_;
return len; return len;
} }
int rtw_endofpktfile(struct pkt_file *pfile) int rtw_endofpktfile(struct pkt_file *pfile)
{ {
_func_enter_;
if (pfile->pkt_len == 0) { if (pfile->pkt_len == 0) {
_func_exit_;
return true; return true;
} }
_func_exit_;
return false; return false;
} }
@ -246,7 +246,7 @@ int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev)
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
s32 res = 0; s32 res = 0;
_func_enter_;
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("+xmit_enry\n")); RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("+xmit_enry\n"));
@ -282,7 +282,7 @@ drop_packet:
exit: exit:
_func_exit_;
return 0; return 0;
} }