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

Commit c01fb496 authored by Larry Finger's avatar Larry Finger Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: Replace rtw_get_current_time() with jiffies 



Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 03f4a957

drivers/staging/rtl8188eu/core/rtw_cmd.c

+3 −3
Original line number Diff line number Diff line
@@ -529,7 +529,7 @@ _func_enter_; 
	res = rtw_enqueue_cmd(pcmdpriv, ph2c);



	if (res == _SUCCESS) {

		pmlmepriv->scan_start_time = rtw_get_current_time();

		pmlmepriv->scan_start_time = jiffies;



		_set_timer(&pmlmepriv->scan_to_timer, SCANNING_TIMEOUT);
@@ -1717,7 +1717,7 @@ _func_enter_; 
		break;

	case LPS_CTRL_SPECIAL_PACKET:

		/* DBG_88E("LPS_CTRL_SPECIAL_PACKET\n"); */

		pwrpriv->DelayLPSLastTimeStamp = rtw_get_current_time();

		pwrpriv->DelayLPSLastTimeStamp = jiffies;

		LPS_Leave(padapter);

		break;

	case LPS_CTRL_LEAVE:
@@ -2279,7 +2279,7 @@ _func_enter_; 
				spin_unlock_bh(&pmlmepriv->scanned_queue.lock);

				goto createbss_cmd_fail;

			}

			pwlan->last_scanned = rtw_get_current_time();

			pwlan->last_scanned = jiffies;

		} else {

			rtw_list_insert_tail(&(pwlan->list), &pmlmepriv->scanned_queue.queue);

		}

drivers/staging/rtl8188eu/core/rtw_ioctl_set.c

+2 −2
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ _func_enter_; 
	/* should we add something here...? */



	if (padapter->securitypriv.btkip_countermeasure) {

		cur_time = rtw_get_current_time();

		cur_time = jiffies;



		if ((cur_time - padapter->securitypriv.btkip_countermeasure_time) > 60 * HZ) {

			padapter->securitypriv.btkip_countermeasure = false;
@@ -343,7 +343,7 @@ _func_enter_; 
handle_tkip_countermeasure:



	if (padapter->securitypriv.btkip_countermeasure) {

		cur_time = rtw_get_current_time();

		cur_time = jiffies;



		if ((cur_time - padapter->securitypriv.btkip_countermeasure_time) > 60 * HZ) {

			padapter->securitypriv.btkip_countermeasure = false;

drivers/staging/rtl8188eu/core/rtw_mlme.c

+7 −7
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ _func_enter_; 
	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;
@@ -229,7 +229,7 @@ _func_enter_; 


	if (pnetwork->fixed)

		goto exit;

	curr_time = rtw_get_current_time();

	curr_time = jiffies;

	if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) ||

	    (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)))

		lifetime = 1;
@@ -345,7 +345,7 @@ _func_exit_; 


void rtw_generate_random_ibss(u8 *pibss)

{

	u32	curtime = rtw_get_current_time();

	u32	curtime = jiffies;



_func_enter_;

	pibss[0] = 0x02;  /* in ad-hoc mode bit1 must set to 1 */
@@ -613,7 +613,7 @@ _func_enter_; 
			memcpy(&(pnetwork->network), target,  get_wlan_bssid_ex_sz(target));

			/*  variable initialize */

			pnetwork->fixed = false;

			pnetwork->last_scanned = rtw_get_current_time();

			pnetwork->last_scanned = jiffies;



			pnetwork->network_type = 0;

			pnetwork->aid = 0;
@@ -637,7 +637,7 @@ _func_enter_; 
			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 receiving from the right channel */

			if (pnetwork->network.PhyInfo.SignalQuality == 101)
@@ -651,7 +651,7 @@ _func_enter_; 
		 */

		bool update_ie = true;



		pnetwork->last_scanned = rtw_get_current_time();

		pnetwork->last_scanned = jiffies;



		/* target.Reserved[0]== 1, means that scanned network is a bcn frame. */

		if ((pnetwork->network.IELength > target->IELength) && (target->Reserved[0] == 1))
@@ -1053,7 +1053,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) {

drivers/staging/rtl8188eu/core/rtw_mlme_ext.c

+6 −6
Original line number Diff line number Diff line
@@ -3822,7 +3822,7 @@ 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 {

		ret = _issue_probereq_p2p(adapter, da, wait_ms > 0 ? true : false);
@@ -4968,7 +4968,7 @@ 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 {

		ret = _issue_probereq(padapter, pssid, da, wait_ms > 0 ? true : false);
@@ -5689,7 +5689,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);
@@ -5812,7 +5812,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);
@@ -5930,7 +5930,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 {

		ret = _issue_deauth(padapter, da, reason, wait_ms > 0 ? true : false);
@@ -6333,7 +6333,7 @@ unsigned int send_beacon(struct adapter *padapter) 
	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 {

drivers/staging/rtl8188eu/core/rtw_p2p.c

+1 −1
Original line number Diff line number Diff line
@@ -1958,7 +1958,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);



	_rtw_memset(&pwdinfo->tx_prov_disc_info, 0x00, sizeof(struct tx_provdisc_req_info));

	pwdinfo->tx_prov_disc_info.wps_config_method_request = WPS_CM_NONE;