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

rtl8188eu: Remove CONFIG_ACTIVE_KEEP_ALIVE_CHECK

Browse source 
This configuration variable is always set

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-18 23:30:35 -05:00
parent e294a4c385
commit 9a0ed4ec27
7 changed files with 1 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
core/rtw_ap.c
View file

@ -365,29 +365,7 @@ void expire_timeout_chk(_adapter *padapter)
psta->expire_to--; psta->expire_to--;
} }
#ifndef CONFIG_ACTIVE_KEEP_ALIVE_CHECK
#ifdef CONFIG_80211N_HT
if ( (psta->flags & WLAN_STA_HT) && (psta->htpriv.agg_enable_bitmap || psta->under_exist_checking) ) {
/* check sta by delba(addba) for 11n STA */
/* ToDo: use CCX report to check for all STAs */
if ( psta->expire_to <= (pstapriv->expire_to - 50 ) ) {
DBG_88E("asoc expire by DELBA/ADDBA! (%d s)\n", (pstapriv->expire_to-psta->expire_to)*2);
psta->under_exist_checking = 0;
psta->expire_to = 0;
} else if ( psta->expire_to <= (pstapriv->expire_to - 3) && (psta->under_exist_checking==0)) {
DBG_88E("asoc check by DELBA/ADDBA! (%d s)\n", (pstapriv->expire_to-psta->expire_to)*2);
psta->under_exist_checking = 1;
/* tear down TX AMPDU */
send_delba(padapter, 1, psta->hwaddr);/* originator */
psta->htpriv.agg_enable_bitmap = 0x0;/* reset */
psta->htpriv.candidate_tid_bitmap = 0x0;/* reset */
}
}
#endif /* CONFIG_80211N_HT */
#endif /* CONFIG_ACTIVE_KEEP_ALIVE_CHECK */
if (psta->expire_to <= 0) { if (psta->expire_to <= 0) {
#ifdef CONFIG_ACTIVE_KEEP_ALIVE_CHECK
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
if (padapter->registrypriv.wifi_spec == 1) { if (padapter->registrypriv.wifi_spec == 1) {
@ -418,7 +396,6 @@ void expire_timeout_chk(_adapter *padapter)
} }
continue; continue;
} }
#endif /* CONFIG_ACTIVE_KEEP_ALIVE_CHECK */
rtw_list_delete(&psta->asoc_list); rtw_list_delete(&psta->asoc_list);
pstapriv->asoc_list_cnt--; pstapriv->asoc_list_cnt--;
@ -440,7 +417,6 @@ void expire_timeout_chk(_adapter *padapter)
_exit_critical_bh(&pstapriv->asoc_list_lock, &irqL); _exit_critical_bh(&pstapriv->asoc_list_lock, &irqL);
#ifdef CONFIG_ACTIVE_KEEP_ALIVE_CHECK
if (chk_alive_num) { if (chk_alive_num) {
u8 backup_oper_channel=0; u8 backup_oper_channel=0;
@ -487,7 +463,6 @@ void expire_timeout_chk(_adapter *padapter)
if (backup_oper_channel>0) /* back to the original operation channel */ if (backup_oper_channel>0) /* back to the original operation channel */
SelectChannel(padapter, backup_oper_channel); SelectChannel(padapter, backup_oper_channel);
} }
#endif /* CONFIG_ACTIVE_KEEP_ALIVE_CHECK */
associated_clients_update(padapter, updated); associated_clients_update(padapter, updated);
} }

4
core/rtw_cmd.c
View file

@ -1983,14 +1983,10 @@ void dynamic_chk_wk_hdl(_adapter *padapter, u8 *pbuf, int sz)
padapter = (_adapter *)pbuf; padapter = (_adapter *)pbuf;
pmlmepriv = &(padapter->mlmepriv); pmlmepriv = &(padapter->mlmepriv);
#ifdef CONFIG_ACTIVE_KEEP_ALIVE_CHECK
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true)
{
expire_timeout_chk(padapter); expire_timeout_chk(padapter);
}
#endif #endif
#endif /* CONFIG_ACTIVE_KEEP_ALIVE_CHECK */
#ifdef DBG_CONFIG_ERROR_DETECT #ifdef DBG_CONFIG_ERROR_DETECT
rtw_hal_sreset_xmit_status_check(padapter); rtw_hal_sreset_xmit_status_check(padapter);

9
core/rtw_mlme.c
View file

@ -2156,15 +2156,6 @@ void rtw_dynamic_check_timer_handlder(_adapter *adapter)
} }
} }
#ifndef CONFIG_ACTIVE_KEEP_ALIVE_CHECK
#ifdef CONFIG_AP_MODE
if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true)
{
expire_timeout_chk(adapter);
}
#endif
#endif /* CONFIG_ACTIVE_KEEP_ALIVE_CHECK */
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)) #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35))
rcu_read_lock(); rcu_read_lock();
#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)) */ #endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)) */

17
core/rtw_mlme_ext.c
View file

@ -523,12 +523,9 @@ int init_mlme_ext_priv(_adapter* padapter)
pmlmeext->mlmeext_init = true; pmlmeext->mlmeext_init = true;
#ifdef CONFIG_ACTIVE_KEEP_ALIVE_CHECK
pmlmeext->active_keep_alive_check = true; pmlmeext->active_keep_alive_check = true;
#endif
return res; return res;
} }
void free_mlme_ext_priv (struct mlme_ext_priv *pmlmeext) void free_mlme_ext_priv (struct mlme_ext_priv *pmlmeext)
@ -9310,14 +9307,7 @@ void linked_status_chk(_adapter *padapter)
int tx_chk = _SUCCESS, rx_chk = _SUCCESS; int tx_chk = _SUCCESS, rx_chk = _SUCCESS;
int rx_chk_limit; int rx_chk_limit;
#if defined(DBG_ROAMING_TEST)
rx_chk_limit = 1;
#elif defined(CONFIG_ACTIVE_KEEP_ALIVE_CHECK)
rx_chk_limit = 4; rx_chk_limit = 4;
#else
rx_chk_limit = 8;
#endif
if ((psta = rtw_get_stainfo(pstapriv, pmlmeinfo->network.MacAddress)) != NULL) if ((psta = rtw_get_stainfo(pstapriv, pmlmeinfo->network.MacAddress)) != NULL)
{ {
bool is_p2p_enable = false; bool is_p2p_enable = false;
@ -9331,7 +9321,6 @@ void linked_status_chk(_adapter *padapter)
if (pxmitpriv->last_tx_pkts == pxmitpriv->tx_pkts) if (pxmitpriv->last_tx_pkts == pxmitpriv->tx_pkts)
tx_chk = _FAIL; tx_chk = _FAIL;
#ifdef CONFIG_ACTIVE_KEEP_ALIVE_CHECK
if (pmlmeext->active_keep_alive_check && (rx_chk == _FAIL || tx_chk == _FAIL)) { if (pmlmeext->active_keep_alive_check && (rx_chk == _FAIL || tx_chk == _FAIL)) {
u8 backup_oper_channel=0; u8 backup_oper_channel=0;
@ -9354,11 +9343,7 @@ void linked_status_chk(_adapter *padapter)
/* back to the original operation channel */ /* back to the original operation channel */
if (backup_oper_channel>0) if (backup_oper_channel>0)
SelectChannel(padapter, backup_oper_channel); SelectChannel(padapter, backup_oper_channel);
} else {
}
else
#endif /* CONFIG_ACTIVE_KEEP_ALIVE_CHECK */
{
if (rx_chk != _SUCCESS) { if (rx_chk != _SUCCESS) {
if (pmlmeext->retry == 0) { if (pmlmeext->retry == 0) {
#ifdef DBG_EXPIRATION_CHK #ifdef DBG_EXPIRATION_CHK

5
core/rtw_sta_mgt.c
View file

@ -131,13 +131,8 @@ _func_enter_;
pstapriv->auth_to = 3; /* 3*2 = 6 sec */ pstapriv->auth_to = 3; /* 3*2 = 6 sec */
pstapriv->assoc_to = 3; pstapriv->assoc_to = 3;
#ifdef CONFIG_ACTIVE_KEEP_ALIVE_CHECK
pstapriv->expire_to = 3; /* 3*2 = 6 sec */ pstapriv->expire_to = 3; /* 3*2 = 6 sec */
#else
pstapriv->expire_to = 60;/* 60*2 = 120 sec = 2 min, expire after no any traffic. */
#endif
pstapriv->max_num_sta = NUM_STA; pstapriv->max_num_sta = NUM_STA;
#endif #endif
_func_exit_; _func_exit_;

4
include/autoconf.h
View file

@ -30,8 +30,6 @@
#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_RTL8188E
#ifdef CONFIG_IOCTL_CFG80211 #ifdef CONFIG_IOCTL_CFG80211
@ -43,10 +41,8 @@
* Internal General Config * Internal General Config
*/ */
//#define CONFIG_H2CLBK
#define CONFIG_EMBEDDED_FWIMG #define CONFIG_EMBEDDED_FWIMG
//#define CONFIG_FILE_FWIMG
#define CONFIG_XMIT_ACK #define CONFIG_XMIT_ACK
#ifdef CONFIG_XMIT_ACK #ifdef CONFIG_XMIT_ACK

8
include/rtw_mlme_ext.h
View file

@ -493,11 +493,7 @@ struct mlme_ext_priv
//recv_decache check for Action_public frame //recv_decache check for Action_public frame
u8 action_public_dialog_token; u8 action_public_dialog_token;
u16 action_public_rxseq; u16 action_public_rxseq;
#ifdef CONFIG_ACTIVE_KEEP_ALIVE_CHECK
u8 active_keep_alive_check; u8 active_keep_alive_check;
#endif
}; };
int init_mlme_ext_priv(_adapter* padapter); int init_mlme_ext_priv(_adapter* padapter);
@ -507,8 +503,6 @@ extern void init_mlme_ext_timer(_adapter *padapter);
extern void init_addba_retry_timer(_adapter *padapter, struct sta_info *psta); extern void init_addba_retry_timer(_adapter *padapter, struct sta_info *psta);
extern struct xmit_frame *alloc_mgtxmitframe(struct xmit_priv *pxmitpriv); extern struct xmit_frame *alloc_mgtxmitframe(struct xmit_priv *pxmitpriv);
//void fill_fwpriv(_adapter * padapter, struct fw_priv *pfwpriv);
unsigned char networktype_to_raid(unsigned char network_type); unsigned char networktype_to_raid(unsigned char network_type);
u8 judge_network_type(_adapter *padapter, unsigned char *rate, int ratelen); u8 judge_network_type(_adapter *padapter, unsigned char *rate, int ratelen);
void get_rate_set(_adapter *padapter, unsigned char *pbssrate, int *bssrate_len); void get_rate_set(_adapter *padapter, unsigned char *pbssrate, int *bssrate_len);
@ -519,8 +513,6 @@ void Save_DM_Func_Flag(_adapter *padapter);
void Restore_DM_Func_Flag(_adapter *padapter); void Restore_DM_Func_Flag(_adapter *padapter);
void Switch_DM_Func(_adapter *padapter, u32 mode, u8 enable); void Switch_DM_Func(_adapter *padapter, u32 mode, u8 enable);
//void Set_NETYPE1_MSR(_adapter *padapter, u8 type);
//void Set_NETYPE0_MSR(_adapter *padapter, u8 type);
void Set_MSR(_adapter *padapter, u8 type); void Set_MSR(_adapter *padapter, u8 type);
u8 rtw_get_oper_ch(_adapter *adapter); u8 rtw_get_oper_ch(_adapter *adapter);