Skip to content

L
linux
Commit c495fc9e authored by navin patidar's avatar navin patidar Committed by Greg Kroah-Hartman
Browse files
Options

staging: rtl8188eu: Replace _cancel_timer_ex() with del_timer_sync() 

Signed-off-by: default avatarnavin patidar <navin.patidar@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f31dcb4d
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 58 deletions
drivers/staging/rtl8188eu/core/rtw_led.c
View file @ c495fc9e
...@@ -89,7 +89,7 @@ void InitLed871x(struct adapter *padapter, struct LED_871x *pLed) ...@@ -89,7 +89,7 @@ void InitLed871x(struct adapter *padapter, struct LED_871x *pLed)
void DeInitLed871x(struct LED_871x *pLed) void DeInitLed871x(struct LED_871x *pLed)
{ {
cancel_work_sync(&(pLed->BlinkWorkItem)); cancel_work_sync(&(pLed->BlinkWorkItem));
_cancel_timer_ex(&(pLed->BlinkTimer)); del_timer_sync(&(pLed->BlinkTimer));
ResetLedStatus(pLed); ResetLedStatus(pLed);
} }
...@@ -251,11 +251,11 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct ...@@ -251,11 +251,11 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct
if (pLed->CurrLedState == LED_BLINK_SCAN || IS_LED_WPS_BLINKING(pLed)) if (pLed->CurrLedState == LED_BLINK_SCAN || IS_LED_WPS_BLINKING(pLed))
return; return;
if (pLed->bLedLinkBlinkInProgress) { if (pLed->bLedLinkBlinkInProgress) {
_cancel_timer_ex(&(pLed->BlinkTimer)); del_timer_sync(&(pLed->BlinkTimer));
pLed->bLedLinkBlinkInProgress = false; pLed->bLedLinkBlinkInProgress = false;
} }
if (pLed->bLedBlinkInProgress) { if (pLed->bLedBlinkInProgress) {
_cancel_timer_ex(&(pLed->BlinkTimer)); del_timer_sync(&(pLed->BlinkTimer));
pLed->bLedBlinkInProgress = false; pLed->bLedBlinkInProgress = false;
} }
...@@ -273,11 +273,11 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct ...@@ -273,11 +273,11 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct
if (pLed->CurrLedState == LED_BLINK_SCAN || IS_LED_WPS_BLINKING(pLed)) if (pLed->CurrLedState == LED_BLINK_SCAN || IS_LED_WPS_BLINKING(pLed))
return; return;
if (pLed->bLedNoLinkBlinkInProgress) { if (pLed->bLedNoLinkBlinkInProgress) {
_cancel_timer_ex(&(pLed->BlinkTimer)); del_timer_sync(&(pLed->BlinkTimer));
pLed->bLedNoLinkBlinkInProgress = false; pLed->bLedNoLinkBlinkInProgress = false;
} }
if (pLed->bLedBlinkInProgress) { if (pLed->bLedBlinkInProgress) {
_cancel_timer_ex(&(pLed->BlinkTimer)); del_timer_sync(&(pLed->BlinkTimer));
pLed->bLedBlinkInProgress = false; pLed->bLedBlinkInProgress = false;
} }
pLed->bLedLinkBlinkInProgress = true; pLed->bLedLinkBlinkInProgress = true;
...@@ -296,15 +296,15 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct ...@@ -296,15 +296,15 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct
if (IS_LED_WPS_BLINKING(pLed)) if (IS_LED_WPS_BLINKING(pLed))
return; return;
if (pLed->bLedNoLinkBlinkInProgress) { if (pLed->bLedNoLinkBlinkInProgress) {
_cancel_timer_ex(&(pLed->BlinkTimer)); del_timer_sync(&(pLed->BlinkTimer));
pLed->bLedNoLinkBlinkInProgress = false; pLed->bLedNoLinkBlinkInProgress = false;
} }
if (pLed->bLedLinkBlinkInProgress) { if (pLed->bLedLinkBlinkInProgress) {
_cancel_timer_ex(&(pLed->BlinkTimer)); del_timer_sync(&(pLed->BlinkTimer));
pLed->bLedLinkBlinkInProgress = false; pLed->bLedLinkBlinkInProgress = false;
} }
if (pLed->bLedBlinkInProgress) { if (pLed->bLedBlinkInProgress) {
_cancel_timer_ex(&(pLed->BlinkTimer)); del_timer_sync(&(pLed->BlinkTimer));
pLed->bLedBlinkInProgress = false; pLed->bLedBlinkInProgress = false;
} }
pLed->bLedScanBlinkInProgress = true; pLed->bLedScanBlinkInProgress = true;
...@@ -323,11 +323,11 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct ...@@ -323,11 +323,11 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct
if (pLed->CurrLedState == LED_BLINK_SCAN || IS_LED_WPS_BLINKING(pLed)) if (pLed->CurrLedState == LED_BLINK_SCAN || IS_LED_WPS_BLINKING(pLed))
return; return;
if (pLed->bLedNoLinkBlinkInProgress) { if (pLed->bLedNoLinkBlinkInProgress) {
_cancel_timer_ex(&(pLed->BlinkTimer)); del_timer_sync(&(pLed->BlinkTimer));
pLed->bLedNoLinkBlinkInProgress = false; pLed->bLedNoLinkBlinkInProgress = false;
} }
if (pLed->bLedLinkBlinkInProgress) { if (pLed->bLedLinkBlinkInProgress) {
_cancel_timer_ex(&(pLed->BlinkTimer)); del_timer_sync(&(pLed->BlinkTimer));
pLed->bLedLinkBlinkInProgress = false; pLed->bLedLinkBlinkInProgress = false;
} }
pLed->bLedBlinkInProgress = true; pLed->bLedBlinkInProgress = true;
...@@ -344,19 +344,19 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct ...@@ -344,19 +344,19 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct
case LED_CTL_START_WPS_BOTTON: case LED_CTL_START_WPS_BOTTON:
if (!pLed->bLedWPSBlinkInProgress) { if (!pLed->bLedWPSBlinkInProgress) {
if (pLed->bLedNoLinkBlinkInProgress) { if (pLed->bLedNoLinkBlinkInProgress) {
_cancel_timer_ex(&(pLed->BlinkTimer)); del_timer_sync(&(pLed->BlinkTimer));
pLed->bLedNoLinkBlinkInProgress = false; pLed->bLedNoLinkBlinkInProgress = false;
} }
if (pLed->bLedLinkBlinkInProgress) { if (pLed->bLedLinkBlinkInProgress) {
_cancel_timer_ex(&(pLed->BlinkTimer)); del_timer_sync(&(pLed->BlinkTimer));
pLed->bLedLinkBlinkInProgress = false; pLed->bLedLinkBlinkInProgress = false;
} }
if (pLed->bLedBlinkInProgress) { if (pLed->bLedBlinkInProgress) {
_cancel_timer_ex(&(pLed->BlinkTimer)); del_timer_sync(&(pLed->BlinkTimer));
pLed->bLedBlinkInProgress = false; pLed->bLedBlinkInProgress = false;
} }
if (pLed->bLedScanBlinkInProgress) { if (pLed->bLedScanBlinkInProgress) {
_cancel_timer_ex(&(pLed->BlinkTimer)); del_timer_sync(&(pLed->BlinkTimer));
pLed->bLedScanBlinkInProgress = false; pLed->bLedScanBlinkInProgress = false;
} }
pLed->bLedWPSBlinkInProgress = true; pLed->bLedWPSBlinkInProgress = true;
...@@ -370,23 +370,23 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct ...@@ -370,23 +370,23 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct
break; break;
case LED_CTL_STOP_WPS: case LED_CTL_STOP_WPS:
if (pLed->bLedNoLinkBlinkInProgress) { if (pLed->bLedNoLinkBlinkInProgress) {
_cancel_timer_ex(&(pLed->BlinkTimer)); del_timer_sync(&(pLed->BlinkTimer));
pLed->bLedNoLinkBlinkInProgress = false; pLed->bLedNoLinkBlinkInProgress = false;
} }
if (pLed->bLedLinkBlinkInProgress) { if (pLed->bLedLinkBlinkInProgress) {
_cancel_timer_ex(&(pLed->BlinkTimer)); del_timer_sync(&(pLed->BlinkTimer));
pLed->bLedLinkBlinkInProgress = false; pLed->bLedLinkBlinkInProgress = false;
} }
if (pLed->bLedBlinkInProgress) { if (pLed->bLedBlinkInProgress) {
_cancel_timer_ex(&(pLed->BlinkTimer)); del_timer_sync(&(pLed->BlinkTimer));
pLed->bLedBlinkInProgress = false; pLed->bLedBlinkInProgress = false;
} }
if (pLed->bLedScanBlinkInProgress) { if (pLed->bLedScanBlinkInProgress) {
_cancel_timer_ex(&(pLed->BlinkTimer)); del_timer_sync(&(pLed->BlinkTimer));
pLed->bLedScanBlinkInProgress = false; pLed->bLedScanBlinkInProgress = false;
} }
if (pLed->bLedWPSBlinkInProgress) if (pLed->bLedWPSBlinkInProgress)
_cancel_timer_ex(&(pLed->BlinkTimer)); del_timer_sync(&(pLed->BlinkTimer));
else else
pLed->bLedWPSBlinkInProgress = true; pLed->bLedWPSBlinkInProgress = true;
pLed->CurrLedState = LED_BLINK_WPS_STOP; pLed->CurrLedState = LED_BLINK_WPS_STOP;
...@@ -400,7 +400,7 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct ...@@ -400,7 +400,7 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct
break; break;
case LED_CTL_STOP_WPS_FAIL: case LED_CTL_STOP_WPS_FAIL:
if (pLed->bLedWPSBlinkInProgress) { if (pLed->bLedWPSBlinkInProgress) {
_cancel_timer_ex(&(pLed->BlinkTimer)); del_timer_sync(&(pLed->BlinkTimer));
pLed->bLedWPSBlinkInProgress = false; pLed->bLedWPSBlinkInProgress = false;
} }
pLed->bLedNoLinkBlinkInProgress = true; pLed->bLedNoLinkBlinkInProgress = true;
...@@ -415,23 +415,23 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct ...@@ -415,23 +415,23 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct
pLed->CurrLedState = RTW_LED_OFF; pLed->CurrLedState = RTW_LED_OFF;
pLed->BlinkingLedState = RTW_LED_OFF; pLed->BlinkingLedState = RTW_LED_OFF;
if (pLed->bLedNoLinkBlinkInProgress) { if (pLed->bLedNoLinkBlinkInProgress) {
_cancel_timer_ex(&(pLed->BlinkTimer)); del_timer_sync(&(pLed->BlinkTimer));
pLed->bLedNoLinkBlinkInProgress = false; pLed->bLedNoLinkBlinkInProgress = false;
} }
if (pLed->bLedLinkBlinkInProgress) { if (pLed->bLedLinkBlinkInProgress) {
_cancel_timer_ex(&(pLed->BlinkTimer)); del_timer_sync(&(pLed->BlinkTimer));
pLed->bLedLinkBlinkInProgress = false; pLed->bLedLinkBlinkInProgress = false;
} }
if (pLed->bLedBlinkInProgress) { if (pLed->bLedBlinkInProgress) {
_cancel_timer_ex(&(pLed->BlinkTimer)); del_timer_sync(&(pLed->BlinkTimer));
pLed->bLedBlinkInProgress = false; pLed->bLedBlinkInProgress = false;
} }
if (pLed->bLedWPSBlinkInProgress) { if (pLed->bLedWPSBlinkInProgress) {
_cancel_timer_ex(&(pLed->BlinkTimer)); del_timer_sync(&(pLed->BlinkTimer));
pLed->bLedWPSBlinkInProgress = false; pLed->bLedWPSBlinkInProgress = false;
} }
if (pLed->bLedScanBlinkInProgress) { if (pLed->bLedScanBlinkInProgress) {
_cancel_timer_ex(&(pLed->BlinkTimer)); del_timer_sync(&(pLed->BlinkTimer));
pLed->bLedScanBlinkInProgress = false; pLed->bLedScanBlinkInProgress = false;
} }
SwLedOff(padapter, pLed); SwLedOff(padapter, pLed);
......
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
View file @ c495fc9e
...@@ -408,9 +408,8 @@ void free_mlme_ext_priv(struct mlme_ext_priv *pmlmeext) ...@@ -408,9 +408,8 @@ void free_mlme_ext_priv(struct mlme_ext_priv *pmlmeext)
return; return;
if (padapter->bDriverStopped) { if (padapter->bDriverStopped) {
_cancel_timer_ex(&pmlmeext->survey_timer); del_timer_sync(&pmlmeext->survey_timer);
_cancel_timer_ex(&pmlmeext->link_timer); del_timer_sync(&pmlmeext->link_timer);
/* _cancel_timer_ex(&pmlmeext->ADDBA_timer); */
} }
} }
...@@ -1495,7 +1494,7 @@ unsigned int OnAssocRsp(struct adapter *padapter, struct recv_frame *precv_frame ...@@ -1495,7 +1494,7 @@ unsigned int OnAssocRsp(struct adapter *padapter, struct recv_frame *precv_frame
if (pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) if (pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS)
return _SUCCESS; return _SUCCESS;
_cancel_timer_ex(&pmlmeext->link_timer); del_timer_sync(&pmlmeext->link_timer);
/* status */ /* status */
status = le16_to_cpu(*(__le16 *)(pframe + WLAN_HDR_A3_LEN + 2)); status = le16_to_cpu(*(__le16 *)(pframe + WLAN_HDR_A3_LEN + 2));
...@@ -1578,7 +1577,7 @@ unsigned int OnDeAuth(struct adapter *padapter, struct recv_frame *precv_frame) ...@@ -1578,7 +1577,7 @@ unsigned int OnDeAuth(struct adapter *padapter, struct recv_frame *precv_frame)
#ifdef CONFIG_88EU_P2P #ifdef CONFIG_88EU_P2P
if (pwdinfo->rx_invitereq_info.scan_op_ch_only) { if (pwdinfo->rx_invitereq_info.scan_op_ch_only) {
_cancel_timer_ex(&pwdinfo->reset_ch_sitesurvey); del_timer_sync(&pwdinfo->reset_ch_sitesurvey);
_set_timer(&pwdinfo->reset_ch_sitesurvey, 10); _set_timer(&pwdinfo->reset_ch_sitesurvey, 10);
} }
#endif /* CONFIG_88EU_P2P */ #endif /* CONFIG_88EU_P2P */
...@@ -1642,7 +1641,7 @@ unsigned int OnDisassoc(struct adapter *padapter, struct recv_frame *precv_frame ...@@ -1642,7 +1641,7 @@ unsigned int OnDisassoc(struct adapter *padapter, struct recv_frame *precv_frame
#ifdef CONFIG_88EU_P2P #ifdef CONFIG_88EU_P2P
if (pwdinfo->rx_invitereq_info.scan_op_ch_only) { if (pwdinfo->rx_invitereq_info.scan_op_ch_only) {
_cancel_timer_ex(&pwdinfo->reset_ch_sitesurvey); del_timer_sync(&pwdinfo->reset_ch_sitesurvey);
_set_timer(&pwdinfo->reset_ch_sitesurvey, 10); _set_timer(&pwdinfo->reset_ch_sitesurvey, 10);
} }
#endif /* CONFIG_88EU_P2P */ #endif /* CONFIG_88EU_P2P */
...@@ -3912,7 +3911,7 @@ static unsigned int on_action_public_p2p(struct recv_frame *precv_frame) ...@@ -3912,7 +3911,7 @@ static unsigned int on_action_public_p2p(struct recv_frame *precv_frame)
return _FAIL; return _FAIL;
#ifdef CONFIG_88EU_P2P #ifdef CONFIG_88EU_P2P
_cancel_timer_ex(&pwdinfo->reset_ch_sitesurvey); del_timer_sync(&pwdinfo->reset_ch_sitesurvey);
/* Do nothing if the driver doesn't enable the P2P function. */ /* Do nothing if the driver doesn't enable the P2P function. */
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE) || rtw_p2p_chk_state(pwdinfo, P2P_STATE_IDLE)) if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE) || rtw_p2p_chk_state(pwdinfo, P2P_STATE_IDLE))
return _SUCCESS; return _SUCCESS;
...@@ -3930,7 +3929,7 @@ static unsigned int on_action_public_p2p(struct recv_frame *precv_frame) ...@@ -3930,7 +3929,7 @@ static unsigned int on_action_public_p2p(struct recv_frame *precv_frame)
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_FAIL)) { if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_FAIL)) {
/* Commented by Albert 20110526 */ /* Commented by Albert 20110526 */
/* In this case, this means the previous nego fail doesn't be reset yet. */ /* In this case, this means the previous nego fail doesn't be reset yet. */
_cancel_timer_ex(&pwdinfo->restore_p2p_state_timer); del_timer_sync(&pwdinfo->restore_p2p_state_timer);
/* Restore the previous p2p state */ /* Restore the previous p2p state */
rtw_p2p_set_state(pwdinfo, rtw_p2p_pre_state(pwdinfo)); rtw_p2p_set_state(pwdinfo, rtw_p2p_pre_state(pwdinfo));
DBG_88E("[%s] Restore the previous p2p state to %d\n", __func__, rtw_p2p_state(pwdinfo)); DBG_88E("[%s] Restore the previous p2p state to %d\n", __func__, rtw_p2p_state(pwdinfo));
...@@ -3960,7 +3959,7 @@ static unsigned int on_action_public_p2p(struct recv_frame *precv_frame) ...@@ -3960,7 +3959,7 @@ static unsigned int on_action_public_p2p(struct recv_frame *precv_frame)
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_ING)) { if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_ING)) {
/* Commented by Albert 20110425 */ /* Commented by Albert 20110425 */
/* The restore timer is enabled when issuing the nego request frame of rtw_p2p_connect function. */ /* The restore timer is enabled when issuing the nego request frame of rtw_p2p_connect function. */
_cancel_timer_ex(&pwdinfo->restore_p2p_state_timer); del_timer_sync(&pwdinfo->restore_p2p_state_timer);
pwdinfo->nego_req_info.benable = false; pwdinfo->nego_req_info.benable = false;
result = process_p2p_group_negotation_resp(pwdinfo, frame_body, len); result = process_p2p_group_negotation_resp(pwdinfo, frame_body, len);
issue_p2p_GO_confirm(pwdinfo->padapter, GetAddr2Ptr(pframe), result); issue_p2p_GO_confirm(pwdinfo->padapter, GetAddr2Ptr(pframe), result);
...@@ -4111,7 +4110,7 @@ static unsigned int on_action_public_p2p(struct recv_frame *precv_frame) ...@@ -4111,7 +4110,7 @@ static unsigned int on_action_public_p2p(struct recv_frame *precv_frame)
u32 attr_contentlen = 0; u32 attr_contentlen = 0;
DBG_88E("[%s] Got invite response frame!\n", __func__); DBG_88E("[%s] Got invite response frame!\n", __func__);
_cancel_timer_ex(&pwdinfo->restore_p2p_state_timer); del_timer_sync(&pwdinfo->restore_p2p_state_timer);
p2p_ie = rtw_get_p2p_ie(frame_body + _PUBLIC_ACTION_IE_OFFSET_, len - _PUBLIC_ACTION_IE_OFFSET_, NULL, &p2p_ielen); p2p_ie = rtw_get_p2p_ie(frame_body + _PUBLIC_ACTION_IE_OFFSET_, len - _PUBLIC_ACTION_IE_OFFSET_, NULL, &p2p_ielen);
if (p2p_ie) { if (p2p_ie) {
rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, &attr_content, &attr_contentlen); rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, &attr_content, &attr_contentlen);
...@@ -4169,7 +4168,7 @@ static unsigned int on_action_public_p2p(struct recv_frame *precv_frame) ...@@ -4169,7 +4168,7 @@ static unsigned int on_action_public_p2p(struct recv_frame *precv_frame)
DBG_88E("[%s] Got Provisioning Discovery Response Frame\n", __func__); DBG_88E("[%s] Got Provisioning Discovery Response Frame\n", __func__);
/* Commented by Albert 20110426 */ /* Commented by Albert 20110426 */
/* The restore timer is enabled when issuing the provisioing request frame in rtw_p2p_prov_disc function. */ /* The restore timer is enabled when issuing the provisioing request frame in rtw_p2p_prov_disc function. */
_cancel_timer_ex(&pwdinfo->restore_p2p_state_timer); del_timer_sync(&pwdinfo->restore_p2p_state_timer);
rtw_p2p_set_state(pwdinfo, P2P_STATE_RX_PROVISION_DIS_RSP); rtw_p2p_set_state(pwdinfo, P2P_STATE_RX_PROVISION_DIS_RSP);
process_p2p_provdisc_resp(pwdinfo, pframe); process_p2p_provdisc_resp(pwdinfo, pframe);
_set_timer(&pwdinfo->restore_p2p_state_timer, P2P_PROVISION_TIMEOUT); _set_timer(&pwdinfo->restore_p2p_state_timer, P2P_PROVISION_TIMEOUT);
...@@ -5866,7 +5865,7 @@ static int _issue_deauth(struct adapter *padapter, unsigned char *da, unsigned s ...@@ -5866,7 +5865,7 @@ static int _issue_deauth(struct adapter *padapter, unsigned char *da, unsigned s
#ifdef CONFIG_88EU_P2P #ifdef CONFIG_88EU_P2P
if (!(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) && (pwdinfo->rx_invitereq_info.scan_op_ch_only)) { if (!(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) && (pwdinfo->rx_invitereq_info.scan_op_ch_only)) {
_cancel_timer_ex(&pwdinfo->reset_ch_sitesurvey); del_timer_sync(&pwdinfo->reset_ch_sitesurvey);
_set_timer(&pwdinfo->reset_ch_sitesurvey, 10); _set_timer(&pwdinfo->reset_ch_sitesurvey, 10);
} }
#endif /* CONFIG_88EU_P2P */ #endif /* CONFIG_88EU_P2P */
...@@ -6813,7 +6812,7 @@ void start_clnt_auth(struct adapter *padapter) ...@@ -6813,7 +6812,7 @@ void start_clnt_auth(struct adapter *padapter)
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);
_cancel_timer_ex(&pmlmeext->link_timer); del_timer_sync(&pmlmeext->link_timer);
pmlmeinfo->state &= (~WIFI_FW_AUTH_NULL); pmlmeinfo->state &= (~WIFI_FW_AUTH_NULL);
pmlmeinfo->state |= WIFI_FW_AUTH_STATE; pmlmeinfo->state |= WIFI_FW_AUTH_STATE;
...@@ -6844,7 +6843,7 @@ void start_clnt_assoc(struct adapter *padapter) ...@@ -6844,7 +6843,7 @@ void start_clnt_assoc(struct adapter *padapter)
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);
_cancel_timer_ex(&pmlmeext->link_timer); del_timer_sync(&pmlmeext->link_timer);
pmlmeinfo->state &= (~(WIFI_FW_AUTH_NULL | WIFI_FW_AUTH_STATE)); pmlmeinfo->state &= (~(WIFI_FW_AUTH_NULL | WIFI_FW_AUTH_STATE));
pmlmeinfo->state |= (WIFI_FW_AUTH_SUCCESS | WIFI_FW_ASSOC_STATE); pmlmeinfo->state |= (WIFI_FW_AUTH_SUCCESS | WIFI_FW_ASSOC_STATE);
...@@ -7491,7 +7490,7 @@ void mlmeext_sta_del_event_callback(struct adapter *padapter) ...@@ -7491,7 +7490,7 @@ void mlmeext_sta_del_event_callback(struct adapter *padapter)
/* set MSR to no link state -> infra. mode */ /* set MSR to no link state -> infra. mode */
Set_MSR(padapter, _HW_STATE_STATION_); Set_MSR(padapter, _HW_STATE_STATION_);
_cancel_timer_ex(&pmlmeext->link_timer); del_timer_sync(&pmlmeext->link_timer);
} }
} }
...@@ -7829,7 +7828,7 @@ u8 createbss_hdl(struct adapter *padapter, u8 *pbuf) ...@@ -7829,7 +7828,7 @@ u8 createbss_hdl(struct adapter *padapter, u8 *pbuf)
/* rtw_hal_set_hwreg(padapter, HW_VAR_INITIAL_GAIN, (u8 *)(&initialgain)); */ /* rtw_hal_set_hwreg(padapter, HW_VAR_INITIAL_GAIN, (u8 *)(&initialgain)); */
/* cancel link timer */ /* cancel link timer */
_cancel_timer_ex(&pmlmeext->link_timer); del_timer_sync(&pmlmeext->link_timer);
/* clear CAM */ /* clear CAM */
flush_all_cam_entry(padapter); flush_all_cam_entry(padapter);
...@@ -7869,7 +7868,7 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf) ...@@ -7869,7 +7868,7 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf)
/* clear CAM */ /* clear CAM */
flush_all_cam_entry(padapter); flush_all_cam_entry(padapter);
_cancel_timer_ex(&pmlmeext->link_timer); del_timer_sync(&pmlmeext->link_timer);
/* set MSR to nolink -> infra. mode */ /* set MSR to nolink -> infra. mode */
Set_MSR(padapter, _HW_STATE_STATION_); Set_MSR(padapter, _HW_STATE_STATION_);
...@@ -7955,7 +7954,7 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf) ...@@ -7955,7 +7954,7 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf)
rtw_hal_set_hwreg(padapter, HW_VAR_MLME_JOIN, (u8 *)(&join_type)); rtw_hal_set_hwreg(padapter, HW_VAR_MLME_JOIN, (u8 *)(&join_type));
/* cancel link timer */ /* cancel link timer */
_cancel_timer_ex(&pmlmeext->link_timer); del_timer_sync(&pmlmeext->link_timer);
start_clnt_join(padapter); start_clnt_join(padapter);
...@@ -7999,7 +7998,7 @@ u8 disconnect_hdl(struct adapter *padapter, unsigned char *pbuf) ...@@ -7999,7 +7998,7 @@ u8 disconnect_hdl(struct adapter *padapter, unsigned char *pbuf)
flush_all_cam_entry(padapter); flush_all_cam_entry(padapter);
_cancel_timer_ex(&pmlmeext->link_timer); del_timer_sync(&pmlmeext->link_timer);
rtw_free_uc_swdec_pending_queue(padapter); rtw_free_uc_swdec_pending_queue(padapter);
......
drivers/staging/rtl8188eu/include/osdep_service.h
View file @ c495fc9e
...@@ -171,11 +171,6 @@ u32 rtw_systime_to_ms(u32 systime); ...@@ -171,11 +171,6 @@ u32 rtw_systime_to_ms(u32 systime);
u32 rtw_ms_to_systime(u32 ms); u32 rtw_ms_to_systime(u32 ms);
s32 rtw_get_passing_time_ms(u32 start); s32 rtw_get_passing_time_ms(u32 start);
static inline unsigned char _cancel_timer_ex(struct timer_list *ptimer)
{
return del_timer_sync(ptimer);
}
static inline void thread_enter(char *name) static inline void thread_enter(char *name)
{ {
allow_signal(SIGTERM); allow_signal(SIGTERM);
......
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
View file @ c495fc9e
...@@ -3441,7 +3441,7 @@ static int rtw_p2p_connect(struct net_device *dev, ...@@ -3441,7 +3441,7 @@ static int rtw_p2p_connect(struct net_device *dev,
memcpy(pwdinfo->nego_req_info.peerDevAddr, pnetwork->network.MacAddress, ETH_ALEN); memcpy(pwdinfo->nego_req_info.peerDevAddr, pnetwork->network.MacAddress, ETH_ALEN);
pwdinfo->nego_req_info.benable = true; pwdinfo->nego_req_info.benable = true;
_cancel_timer_ex(&pwdinfo->restore_p2p_state_timer); del_timer_sync(&pwdinfo->restore_p2p_state_timer);
if (rtw_p2p_state(pwdinfo) != P2P_STATE_GONEGO_OK) { if (rtw_p2p_state(pwdinfo) != P2P_STATE_GONEGO_OK) {
/* Restore to the listen state if the current p2p state is not nego OK */ /* Restore to the listen state if the current p2p state is not nego OK */
rtw_p2p_set_state(pwdinfo, P2P_STATE_LISTEN); rtw_p2p_set_state(pwdinfo, P2P_STATE_LISTEN);
......
drivers/staging/rtl8188eu/os_dep/os_intfs.c
View file @ c495fc9e
...@@ -930,22 +930,22 @@ void rtw_cancel_all_timer(struct adapter *padapter) ...@@ -930,22 +930,22 @@ void rtw_cancel_all_timer(struct adapter *padapter)
{ {
RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+rtw_cancel_all_timer\n")); RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+rtw_cancel_all_timer\n"));
_cancel_timer_ex(&padapter->mlmepriv.assoc_timer); del_timer_sync(&padapter->mlmepriv.assoc_timer);
RT_TRACE(_module_os_intfs_c_, _drv_info_, ("rtw_cancel_all_timer:cancel association timer complete!\n")); RT_TRACE(_module_os_intfs_c_, _drv_info_, ("rtw_cancel_all_timer:cancel association timer complete!\n"));
_cancel_timer_ex(&padapter->mlmepriv.scan_to_timer); del_timer_sync(&padapter->mlmepriv.scan_to_timer);
RT_TRACE(_module_os_intfs_c_, _drv_info_, ("rtw_cancel_all_timer:cancel scan_to_timer!\n")); RT_TRACE(_module_os_intfs_c_, _drv_info_, ("rtw_cancel_all_timer:cancel scan_to_timer!\n"));
_cancel_timer_ex(&padapter->mlmepriv.dynamic_chk_timer); del_timer_sync(&padapter->mlmepriv.dynamic_chk_timer);
RT_TRACE(_module_os_intfs_c_, _drv_info_, ("rtw_cancel_all_timer:cancel dynamic_chk_timer!\n")); RT_TRACE(_module_os_intfs_c_, _drv_info_, ("rtw_cancel_all_timer:cancel dynamic_chk_timer!\n"));
/* cancel sw led timer */ /* cancel sw led timer */
rtw_hal_sw_led_deinit(padapter); rtw_hal_sw_led_deinit(padapter);
RT_TRACE(_module_os_intfs_c_, _drv_info_, ("rtw_cancel_all_timer:cancel DeInitSwLeds!\n")); RT_TRACE(_module_os_intfs_c_, _drv_info_, ("rtw_cancel_all_timer:cancel DeInitSwLeds!\n"));
_cancel_timer_ex(&padapter->pwrctrlpriv.pwr_state_check_timer); del_timer_sync(&padapter->pwrctrlpriv.pwr_state_check_timer);
_cancel_timer_ex(&padapter->recvpriv.signal_stat_timer); del_timer_sync(&padapter->recvpriv.signal_stat_timer);
} }
u8 rtw_free_drv_sw(struct adapter *padapter) u8 rtw_free_drv_sw(struct adapter *padapter)
...@@ -959,9 +959,9 @@ u8 rtw_free_drv_sw(struct adapter *padapter) ...@@ -959,9 +959,9 @@ u8 rtw_free_drv_sw(struct adapter *padapter)
{ {
struct wifidirect_info *pwdinfo = &padapter->wdinfo; struct wifidirect_info *pwdinfo = &padapter->wdinfo;
if (!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) { if (!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) {
_cancel_timer_ex(&pwdinfo->find_phase_timer); del_timer_sync(&pwdinfo->find_phase_timer);
_cancel_timer_ex(&pwdinfo->restore_p2p_state_timer); del_timer_sync(&pwdinfo->restore_p2p_state_timer);
_cancel_timer_ex(&pwdinfo->pre_tx_scan_timer); del_timer_sync(&pwdinfo->pre_tx_scan_timer);
rtw_p2p_set_state(pwdinfo, P2P_STATE_NONE); rtw_p2p_set_state(pwdinfo, P2P_STATE_NONE);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7