skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2025-05-08 14:33:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Remove wrapper routine rtw_get_current_time()

Browse source 
This wrapper can be replaced with jiffies.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-08-15 16:34:17 -05:00
parent e6a0d110e4
commit 1e6accffc4
21 changed files with 67 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/rtw_cmd.c
View file

@ -584,7 +584,7 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, struct ndis_802_11_ssid *ssid,
if (res == _SUCCESS) {
pmlmepriv->scan_start_time = rtw_get_current_time();
pmlmepriv->scan_start_time = jiffies;
_set_timer(&pmlmepriv->scan_to_timer, SCANNING_TIMEOUT);
@ -1934,14 +1934,12 @@ static void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type)
break;
case LPS_CTRL_SPECIAL_PACKET:
/* DBG_871X("LPS_CTRL_SPECIAL_PACKET\n"); */
pwrpriv->DelayLPSLastTimeStamp = rtw_get_current_time();
pwrpriv->DelayLPSLastTimeStamp = jiffies;
#ifdef CONFIG_BT_COEXIST
BT_SpecialPacketNotify(padapter);
if (BT_1Ant(padapter) == false)
#endif
{
LPS_Leave(padapter);
}
break;
case LPS_CTRL_LEAVE:
/* DBG_871X("LPS_CTRL_LEAVE\n"); */
@ -2564,7 +2562,7 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)
spin_unlock_bh(&(pmlmepriv->scanned_queue.lock));
goto createbss_cmd_fail;
}
pwlan->last_scanned = rtw_get_current_time();
pwlan->last_scanned = jiffies;
}
else
{

4
core/rtw_efuse.c
View file

@ -184,10 +184,8 @@ ReadEFuseByte(
u32 value32;
u8 readbyte;
u16 retry;
/* u32 start =rtw_get_current_time(); */
if (bPseudoTest)
{
if (bPseudoTest) {
Efuse_Read1ByteFromFakeContent(Adapter, _offset, pbuf);
return;
}

17
core/rtw_mlme.c
View file

@ -216,7 +216,7 @@ struct wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv )/* _queue *
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("_rtw_alloc_network: ptr =%p\n", plist));
pnetwork->network_type = 0;
pnetwork->fixed = false;
pnetwork->last_scanned = rtw_get_current_time();
pnetwork->last_scanned = jiffies;
pnetwork->aid =0;
pnetwork->join_res =0;
@ -245,7 +245,7 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv , struct wlan_network *pnetwo
if (pnetwork->fixed == true)
goto exit;
curr_time = rtw_get_current_time();
curr_time = jiffies;
if ( (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) ==true ) ||
(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) ==true ) )
@ -404,7 +404,7 @@ sint rtw_if_up(struct adapter *padapter) {
void rtw_generate_random_ibss(u8* pibss)
{
u32 curtime = rtw_get_current_time();
u32 curtime = jiffies;
;
pibss[0] = 0x02; /* in ad-hoc mode bit1 must set to 1 */
@ -761,10 +761,9 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t
rtw_hal_get_def_var(adapter, HAL_DEF_CURRENT_ANTENNA, &(target->PhyInfo.Optimum_antenna));
memcpy(&(pnetwork->network), target, get_wlan_bssid_ex_sz(target));
/* pnetwork->last_scanned = rtw_get_current_time(); */
/* variable initialize */
pnetwork->fixed = false;
pnetwork->last_scanned = rtw_get_current_time();
pnetwork->last_scanned = jiffies;
pnetwork->network_type = 0;
pnetwork->aid =0;
@ -789,7 +788,7 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t
rtw_hal_get_def_var(adapter, HAL_DEF_CURRENT_ANTENNA, &(target->PhyInfo.Optimum_antenna));
memcpy(&(pnetwork->network), target, bssid_ex_sz );
pnetwork->last_scanned = rtw_get_current_time();
pnetwork->last_scanned = jiffies;
/* bss info not receving from the right channel */
if (pnetwork->network.PhyInfo.SignalQuality == 101)
@ -806,7 +805,7 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t
*/
bool update_ie = true;
pnetwork->last_scanned = rtw_get_current_time();
pnetwork->last_scanned = jiffies;
/* target.Reserved[0]==1, means that scaned network is a bcn frame. */
/* probe resp(3) > beacon(1) > probe req(2) */
@ -1312,7 +1311,7 @@ void rtw_indicate_disconnect( struct adapter *padapter )
rtw_os_indicate_disconnect(padapter);
/* set ips_deny_time to avoid enter IPS before LPS leave */
adapter_to_pwrctl(padapter)->ips_deny_time = rtw_get_current_time() + rtw_ms_to_systime(3000);
adapter_to_pwrctl(padapter)->ips_deny_time = jiffies + rtw_ms_to_systime(3000);
_clr_fwstate_(pmlmepriv, _FW_LINKED);
@ -1341,7 +1340,7 @@ void rtw_scan_abort(struct adapter *adapter)
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
struct mlme_ext_priv *pmlmeext = &(adapter->mlmeextpriv);
start = rtw_get_current_time();
start = jiffies;
pmlmeext->scan_abort = true;
while (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)
&& rtw_get_passing_time_ms(start) <= 200) {

22
core/rtw_mlme_ext.c
View file

@ -4705,10 +4705,9 @@ int issue_probereq_p2p_ex(struct adapter *adapter, u8 *da, int try_cnt, int wait
{
int ret;
int i = 0;
u32 start = rtw_get_current_time();
u32 start = jiffies;
do
{
do {
ret = _issue_probereq_p2p(adapter, da, wait_ms>0?true:false);
i++;
@ -4719,7 +4718,7 @@ int issue_probereq_p2p_ex(struct adapter *adapter, u8 *da, int try_cnt, int wait
if (i < try_cnt && wait_ms > 0 && ret ==_FAIL)
rtw_msleep_os(wait_ms);
}while ((i<try_cnt) && ((ret ==_FAIL)||(wait_ms == 0)));
} while ((i<try_cnt) && ((ret ==_FAIL)||(wait_ms == 0)));
if (ret != _FAIL) {
ret = _SUCCESS;
@ -6242,10 +6241,9 @@ int issue_probereq_ex(struct adapter *padapter, struct ndis_802_11_ssid *pssid,
{
int ret;
int i = 0;
u32 start = rtw_get_current_time();
u32 start = jiffies;
do
{
do {
ret = _issue_probereq(padapter, pssid, da, wait_ms>0?true:false);
i++;
@ -6256,7 +6254,7 @@ int issue_probereq_ex(struct adapter *padapter, struct ndis_802_11_ssid *pssid,
if (i < try_cnt && wait_ms > 0 && ret ==_FAIL)
rtw_msleep_os(wait_ms);
}while ((i<try_cnt) && ((ret ==_FAIL)||(wait_ms == 0)));
} while ((i<try_cnt) && ((ret ==_FAIL)||(wait_ms == 0)));
if (ret != _FAIL) {
ret = _SUCCESS;
@ -7062,7 +7060,7 @@ int issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int pow
{
int ret;
int i = 0;
u32 start = rtw_get_current_time();
u32 start = jiffies;
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -7197,7 +7195,7 @@ int issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 tid, int
{
int ret;
int i = 0;
u32 start = rtw_get_current_time();
u32 start = jiffies;
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -7325,7 +7323,7 @@ int issue_deauth_ex(struct adapter *padapter, u8 *da, unsigned short reason, int
{
int ret;
int i = 0;
u32 start = rtw_get_current_time();
u32 start = jiffies;
do
{
@ -7866,7 +7864,7 @@ unsigned int send_beacon(struct adapter *padapter)
u8 bxmitok = false;
int issue =0;
int poll = 0;
u32 start = rtw_get_current_time();
u32 start = jiffies;
rtw_hal_set_hwreg(padapter, HW_VAR_BCN_VALID, NULL);
do{

2
core/rtw_p2p.c
View file

@ -4245,7 +4245,7 @@ void init_wifidirect_info( struct adapter* padapter, enum P2P_ROLE role)
rtw_p2p_findphase_ex_set(pwdinfo, P2P_FINDPHASE_EX_NONE);
pwdinfo->listen_dwell = ( u8 ) (( rtw_get_current_time() % 3 ) + 1);
pwdinfo->listen_dwell = ( u8 ) ((jiffies % 3) + 1);
/* DBG_8192C( "[%s] listen_dwell time is %d00ms\n", __FUNCTION__, pwdinfo->listen_dwell ); */
memset( &pwdinfo->tx_prov_disc_info, 0x00, sizeof( struct tx_provdisc_req_info ) );

22
core/rtw_pwrctrl.c
View file

@ -129,7 +129,7 @@ static bool rtw_pwr_unassociated_idle(struct adapter *adapter)
bool ret = false;
if (adapter_to_pwrctl(adapter)->ips_deny_time >= rtw_get_current_time()) {
if (adapter_to_pwrctl(adapter)->ips_deny_time >= jiffies) {
/* DBG_871X("%s ips_deny_time\n", __func__); */
goto exit;
}
@ -403,7 +403,7 @@ void rtw_set_rpwm(struct adapter *padapter, u8 pslv)
#ifdef CONFIG_DETECT_CPWM_BY_POLLING
if (rpwm & PS_ACK)
{
cpwm_polling_start_time = rtw_get_current_time();
cpwm_polling_start_time = jiffies;
/* polling cpwm */
do{
@ -421,8 +421,6 @@ void rtw_set_rpwm(struct adapter *padapter, u8 pslv)
DBG_871X("%s polling cpwm timeout!!!!!!!!!!\n", __FUNCTION__);
}
#endif
;
}
u8 PS_RDY_CHECK(struct adapter * padapter);
@ -435,7 +433,7 @@ u8 PS_RDY_CHECK(struct adapter * padapter)
if (true == pwrpriv->bInSuspend )
return false;
curr_time = rtw_get_current_time();
curr_time = jiffies;
delta_time = curr_time -pwrpriv->DelayLPSLastTimeStamp;
if (delta_time < LPS_DELAY_TIME)
@ -541,7 +539,7 @@ s32 LPS_RF_ON_check(struct adapter *padapter, u32 delay_ms)
u8 bAwake = false;
s32 err = 0;
start_time = rtw_get_current_time();
start_time = jiffies;
while (1)
{
rtw_hal_get_hwreg(padapter, HW_VAR_FWLPS_RF_ON, &bAwake);
@ -848,7 +846,7 @@ u8 rtw_interface_ps_func(struct adapter *padapter, enum HAL_INTF_PS_FUNC efunc_i
inline void rtw_set_ips_deny(struct adapter *padapter, u32 ms)
{
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
pwrpriv->ips_deny_time = rtw_get_current_time() + rtw_ms_to_systime(ms);
pwrpriv->ips_deny_time = jiffies + rtw_ms_to_systime(ms);
}
/*
@ -863,10 +861,10 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *cal
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
int ret = _SUCCESS;
u32 start = rtw_get_current_time();
u32 start = jiffies;
if (pwrpriv->ips_deny_time < rtw_get_current_time() + rtw_ms_to_systime(ips_deffer_ms))
pwrpriv->ips_deny_time = rtw_get_current_time() + rtw_ms_to_systime(ips_deffer_ms);
if (pwrpriv->ips_deny_time < jiffies + rtw_ms_to_systime(ips_deffer_ms))
pwrpriv->ips_deny_time = jiffies + rtw_ms_to_systime(ips_deffer_ms);
if (pwrpriv->ps_processing) {
DBG_871X("%s wait ps_processing...\n", __func__);
@ -986,8 +984,8 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *cal
}
exit:
if (pwrpriv->ips_deny_time < rtw_get_current_time() + rtw_ms_to_systime(ips_deffer_ms))
pwrpriv->ips_deny_time = rtw_get_current_time() + rtw_ms_to_systime(ips_deffer_ms);
if (pwrpriv->ips_deny_time < jiffies + rtw_ms_to_systime(ips_deffer_ms))
pwrpriv->ips_deny_time = jiffies + rtw_ms_to_systime(ips_deffer_ms);
return ret;
}

8
core/rtw_security.c
View file

@ -761,7 +761,7 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe)
res =_FAIL;
if (start == 0)
start = rtw_get_current_time();
start = jiffies;
if (is_broadcast_mac_addr(prxattrib->ra))
no_gkey_bc_cnt++;
@ -773,7 +773,7 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe)
DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT" no_gkey_bc_cnt:%u, no_gkey_mc_cnt:%u\n",
FUNC_ADPT_ARG(padapter), no_gkey_bc_cnt, no_gkey_mc_cnt);
}
start = rtw_get_current_time();
start = jiffies;
no_gkey_bc_cnt = 0;
no_gkey_mc_cnt = 0;
}
@ -1845,7 +1845,7 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe)
res =_FAIL;
if (start == 0)
start = rtw_get_current_time();
start = jiffies;
if (is_broadcast_mac_addr(prxattrib->ra))
no_gkey_bc_cnt++;
@ -1857,7 +1857,7 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe)
DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT" no_gkey_bc_cnt:%u, no_gkey_mc_cnt:%u\n",
FUNC_ADPT_ARG(padapter), no_gkey_bc_cnt, no_gkey_mc_cnt);
}
start = rtw_get_current_time();
start = jiffies;
no_gkey_bc_cnt = 0;
no_gkey_mc_cnt = 0;
}

2
core/rtw_sreset.c
View file

@ -257,7 +257,7 @@ void sreset_reset(struct adapter *padapter)
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
unsigned long irqL;
u32 start = rtw_get_current_time();
u32 start = jiffies;
DBG_871X("%s\n", __FUNCTION__);

2
core/rtw_wlan_util.c
View file

@ -391,7 +391,7 @@ inline u8 rtw_get_oper_ch(struct adapter *adapter)
inline void rtw_set_oper_ch(struct adapter *adapter, u8 ch)
{
if (adapter_to_dvobj(adapter)->oper_channel != ch)
adapter_to_dvobj(adapter)->on_oper_ch_time = rtw_get_current_time();
adapter_to_dvobj(adapter)->on_oper_ch_time = jiffies;
adapter_to_dvobj(adapter)->oper_channel = ch;
}

8
core/rtw_xmit.c
View file

@ -2660,14 +2660,14 @@ s32 rtw_xmit(struct adapter *padapter, struct sk_buff **ppkt)
s32 res;
if (start == 0)
start = rtw_get_current_time();
start = jiffies;
pxmitframe = rtw_alloc_xmitframe(pxmitpriv);
if (rtw_get_passing_time_ms(start) > 2000) {
if (drop_cnt)
DBG_871X("DBG_TX_DROP_FRAME %s no more pxmitframe, drop_cnt:%u\n", __FUNCTION__, drop_cnt);
start = rtw_get_current_time();
start = jiffies;
drop_cnt = 0;
}
@ -3197,7 +3197,7 @@ void xmit_delivery_enabled_frames(struct adapter *padapter, struct sta_info *pst
void rtw_sctx_init(struct submit_ctx *sctx, int timeout_ms)
{
sctx->timeout_ms = timeout_ms;
sctx->submit_time = rtw_get_current_time();
sctx->submit_time = jiffies;
init_completion(&sctx->done);
sctx->status = RTW_SCTX_SUBMITTED;
}
@ -3259,7 +3259,7 @@ int rtw_ack_tx_wait(struct xmit_priv *pxmitpriv, u32 timeout_ms)
{
struct submit_ctx *pack_tx_ops = &pxmitpriv->ack_tx_ops;
pack_tx_ops->submit_time = rtw_get_current_time();
pack_tx_ops->submit_time = jiffies;
pack_tx_ops->timeout_ms = timeout_ms;
pack_tx_ops->status = RTW_SCTX_SUBMITTED;