mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2024-11-29 15:43:38 +00:00
rtl8188eu: Remove CONFIG_SET_SCAN_DENY_TIMER
This one is always defined. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
parent
af84d3c9c6
commit
cc8740eb70
5 changed files with 0 additions and 25 deletions
|
@ -2379,7 +2379,6 @@ void rtw_dynamic_check_timer_handlder(struct adapter *adapter)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#ifdef CONFIG_SET_SCAN_DENY_TIMER
|
|
||||||
inline bool rtw_is_scan_deny(struct adapter *adapter)
|
inline bool rtw_is_scan_deny(struct adapter *adapter)
|
||||||
{
|
{
|
||||||
struct mlme_priv *mlmepriv = &adapter->mlmepriv;
|
struct mlme_priv *mlmepriv = &adapter->mlmepriv;
|
||||||
|
@ -2407,7 +2406,6 @@ void rtw_set_scan_deny(struct adapter *adapter, u32 ms)
|
||||||
_set_timer(&mlmepriv->set_scan_deny_timer, ms);
|
_set_timer(&mlmepriv->set_scan_deny_timer, ms);
|
||||||
|
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CONFIG_DETECT_C2H_BY_POLLING
|
#ifdef CONFIG_DETECT_C2H_BY_POLLING
|
||||||
void rtw_event_polling_timer_hdl(struct adapter *adapter)
|
void rtw_event_polling_timer_hdl(struct adapter *adapter)
|
||||||
|
|
|
@ -18,20 +18,12 @@
|
||||||
*
|
*
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
|
|
||||||
//***** temporarily flag *******
|
|
||||||
/*
|
/*
|
||||||
* Public General Config
|
* Public General Config
|
||||||
*/
|
*/
|
||||||
#define AUTOCONF_INCLUDED
|
|
||||||
#define RTL871X_MODULE_NAME "88EU"
|
#define RTL871X_MODULE_NAME "88EU"
|
||||||
#define DRV_NAME "rtl8188eu"
|
#define DRV_NAME "rtl8188eu"
|
||||||
|
|
||||||
#define CONFIG_USB_HCI
|
|
||||||
|
|
||||||
#define CONFIG_RTL8188E
|
|
||||||
|
|
||||||
#define CONFIG_SET_SCAN_DENY_TIMER
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Internal General Config
|
* Internal General Config
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -423,10 +423,8 @@ struct mlme_priv {
|
||||||
_timer scan_to_timer; // driver itself handles scan_timeout status.
|
_timer scan_to_timer; // driver itself handles scan_timeout status.
|
||||||
u32 scan_start_time; // used to evaluate the time spent in scanning
|
u32 scan_start_time; // used to evaluate the time spent in scanning
|
||||||
|
|
||||||
#ifdef CONFIG_SET_SCAN_DENY_TIMER
|
|
||||||
_timer set_scan_deny_timer;
|
_timer set_scan_deny_timer;
|
||||||
ATOMIC_T set_scan_deny; //0: allowed, 1: deny
|
ATOMIC_T set_scan_deny; //0: allowed, 1: deny
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CONFIG_DETECT_C2H_BY_POLLING
|
#ifdef CONFIG_DETECT_C2H_BY_POLLING
|
||||||
_timer event_polling_timer;
|
_timer event_polling_timer;
|
||||||
|
@ -729,17 +727,10 @@ extern void _rtw_join_timeout_handler(struct adapter *adapter);
|
||||||
extern void rtw_scan_timeout_handler(struct adapter *adapter);
|
extern void rtw_scan_timeout_handler(struct adapter *adapter);
|
||||||
|
|
||||||
extern void rtw_dynamic_check_timer_handlder(struct adapter *adapter);
|
extern void rtw_dynamic_check_timer_handlder(struct adapter *adapter);
|
||||||
#ifdef CONFIG_SET_SCAN_DENY_TIMER
|
|
||||||
bool rtw_is_scan_deny(struct adapter *adapter);
|
bool rtw_is_scan_deny(struct adapter *adapter);
|
||||||
void rtw_clear_scan_deny(struct adapter *adapter);
|
void rtw_clear_scan_deny(struct adapter *adapter);
|
||||||
void rtw_set_scan_deny_timer_hdl(struct adapter *adapter);
|
void rtw_set_scan_deny_timer_hdl(struct adapter *adapter);
|
||||||
void rtw_set_scan_deny(struct adapter *adapter, u32 ms);
|
void rtw_set_scan_deny(struct adapter *adapter, u32 ms);
|
||||||
#else
|
|
||||||
#define rtw_is_scan_deny(adapter) false
|
|
||||||
#define rtw_clear_scan_deny(adapter) do {} while (0)
|
|
||||||
#define rtw_set_scan_deny_timer_hdl(adapter) do {} while (0)
|
|
||||||
#define rtw_set_scan_deny(adapter, ms) do {} while (0)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CONFIG_DETECT_C2H_BY_POLLING
|
#ifdef CONFIG_DETECT_C2H_BY_POLLING
|
||||||
extern void rtw_event_polling_timer_hdl(struct adapter *adapter);
|
extern void rtw_event_polling_timer_hdl(struct adapter *adapter);
|
||||||
|
|
|
@ -104,13 +104,11 @@ if (adapter->registrypriv.mp_mode == 1)
|
||||||
_set_timer(&adapter->mlmepriv.dynamic_chk_timer, 2000);
|
_set_timer(&adapter->mlmepriv.dynamic_chk_timer, 2000);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_SET_SCAN_DENY_TIMER
|
|
||||||
static void _rtw_set_scan_deny_timer_hdl(void *FunctionContext)
|
static void _rtw_set_scan_deny_timer_hdl(void *FunctionContext)
|
||||||
{
|
{
|
||||||
struct adapter *adapter = (struct adapter *)FunctionContext;
|
struct adapter *adapter = (struct adapter *)FunctionContext;
|
||||||
rtw_set_scan_deny_timer_hdl(adapter);
|
rtw_set_scan_deny_timer_hdl(adapter);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CONFIG_DETECT_C2H_BY_POLLING
|
#ifdef CONFIG_DETECT_C2H_BY_POLLING
|
||||||
void _rtw_event_polling_timer_hdl(void *FunctionContext)
|
void _rtw_event_polling_timer_hdl(void *FunctionContext)
|
||||||
|
@ -133,9 +131,7 @@ void rtw_init_mlme_timer(struct adapter *padapter)
|
||||||
|
|
||||||
_init_timer(&(pmlmepriv->dynamic_chk_timer), padapter->pnetdev, _dynamic_check_timer_handlder, padapter);
|
_init_timer(&(pmlmepriv->dynamic_chk_timer), padapter->pnetdev, _dynamic_check_timer_handlder, padapter);
|
||||||
|
|
||||||
#ifdef CONFIG_SET_SCAN_DENY_TIMER
|
|
||||||
_init_timer(&(pmlmepriv->set_scan_deny_timer), padapter->pnetdev, _rtw_set_scan_deny_timer_hdl, padapter);
|
_init_timer(&(pmlmepriv->set_scan_deny_timer), padapter->pnetdev, _rtw_set_scan_deny_timer_hdl, padapter);
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CONFIG_DETECT_C2H_BY_POLLING
|
#ifdef CONFIG_DETECT_C2H_BY_POLLING
|
||||||
_init_timer(&(pmlmepriv->event_polling_timer), padapter->pnetdev, _rtw_event_polling_timer_hdl, padapter);
|
_init_timer(&(pmlmepriv->event_polling_timer), padapter->pnetdev, _rtw_event_polling_timer_hdl, padapter);
|
||||||
|
|
|
@ -1049,11 +1049,9 @@ void rtw_cancel_all_timer(struct adapter *padapter)
|
||||||
_cancel_timer_ex(&padapter->cfg80211_wdinfo.remain_on_ch_timer);
|
_cancel_timer_ex(&padapter->cfg80211_wdinfo.remain_on_ch_timer);
|
||||||
#endif /* CONFIG_P2P */
|
#endif /* CONFIG_P2P */
|
||||||
|
|
||||||
#ifdef CONFIG_SET_SCAN_DENY_TIMER
|
|
||||||
_cancel_timer_ex(&padapter->mlmepriv.set_scan_deny_timer);
|
_cancel_timer_ex(&padapter->mlmepriv.set_scan_deny_timer);
|
||||||
rtw_clear_scan_deny(padapter);
|
rtw_clear_scan_deny(padapter);
|
||||||
RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel set_scan_deny_timer! \n"));
|
RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel set_scan_deny_timer! \n"));
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CONFIG_NEW_SIGNAL_STAT_PROCESS
|
#ifdef CONFIG_NEW_SIGNAL_STAT_PROCESS
|
||||||
_cancel_timer_ex(&padapter->recvpriv.signal_stat_timer);
|
_cancel_timer_ex(&padapter->recvpriv.signal_stat_timer);
|
||||||
|
|
Loading…
Reference in a new issue