From 9a0ed4ec2725c436533aa1db03da3d57a5fd2b4d Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Thu, 18 Jul 2013 23:30:35 -0500 Subject: [PATCH] rtl8188eu: Remove CONFIG_ACTIVE_KEEP_ALIVE_CHECK This configuration variable is always set Signed-off-by: Larry Finger --- core/rtw_ap.c | 25 ------------------------- core/rtw_cmd.c | 4 ---- core/rtw_mlme.c | 9 --------- core/rtw_mlme_ext.c | 17 +---------------- core/rtw_sta_mgt.c | 5 ----- include/autoconf.h | 4 ---- include/rtw_mlme_ext.h | 8 -------- 7 files changed, 1 insertion(+), 71 deletions(-) diff --git a/core/rtw_ap.c b/core/rtw_ap.c index 581073b..91adbf6 100644 --- a/core/rtw_ap.c +++ b/core/rtw_ap.c @@ -365,29 +365,7 @@ void expire_timeout_chk(_adapter *padapter) 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) { - #ifdef CONFIG_ACTIVE_KEEP_ALIVE_CHECK struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; if (padapter->registrypriv.wifi_spec == 1) { @@ -418,7 +396,6 @@ void expire_timeout_chk(_adapter *padapter) } continue; } - #endif /* CONFIG_ACTIVE_KEEP_ALIVE_CHECK */ rtw_list_delete(&psta->asoc_list); pstapriv->asoc_list_cnt--; @@ -440,7 +417,6 @@ void expire_timeout_chk(_adapter *padapter) _exit_critical_bh(&pstapriv->asoc_list_lock, &irqL); -#ifdef CONFIG_ACTIVE_KEEP_ALIVE_CHECK if (chk_alive_num) { 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 */ SelectChannel(padapter, backup_oper_channel); } -#endif /* CONFIG_ACTIVE_KEEP_ALIVE_CHECK */ associated_clients_update(padapter, updated); } diff --git a/core/rtw_cmd.c b/core/rtw_cmd.c index 983304c..56ee2a2 100644 --- a/core/rtw_cmd.c +++ b/core/rtw_cmd.c @@ -1983,14 +1983,10 @@ void dynamic_chk_wk_hdl(_adapter *padapter, u8 *pbuf, int sz) padapter = (_adapter *)pbuf; pmlmepriv = &(padapter->mlmepriv); -#ifdef CONFIG_ACTIVE_KEEP_ALIVE_CHECK #ifdef CONFIG_AP_MODE if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) - { expire_timeout_chk(padapter); - } #endif -#endif /* CONFIG_ACTIVE_KEEP_ALIVE_CHECK */ #ifdef DBG_CONFIG_ERROR_DETECT rtw_hal_sreset_xmit_status_check(padapter); diff --git a/core/rtw_mlme.c b/core/rtw_mlme.c index be776ee..586d106 100644 --- a/core/rtw_mlme.c +++ b/core/rtw_mlme.c @@ -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)) rcu_read_lock(); #endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)) */ diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c index fb07a1c..fc97f97 100644 --- a/core/rtw_mlme_ext.c +++ b/core/rtw_mlme_ext.c @@ -523,12 +523,9 @@ int init_mlme_ext_priv(_adapter* padapter) pmlmeext->mlmeext_init = true; -#ifdef CONFIG_ACTIVE_KEEP_ALIVE_CHECK pmlmeext->active_keep_alive_check = true; -#endif return res; - } 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 rx_chk_limit; - #if defined(DBG_ROAMING_TEST) - rx_chk_limit = 1; - #elif defined(CONFIG_ACTIVE_KEEP_ALIVE_CHECK) rx_chk_limit = 4; - #else - rx_chk_limit = 8; - #endif - if ((psta = rtw_get_stainfo(pstapriv, pmlmeinfo->network.MacAddress)) != NULL) { bool is_p2p_enable = false; @@ -9331,7 +9321,6 @@ void linked_status_chk(_adapter *padapter) if (pxmitpriv->last_tx_pkts == pxmitpriv->tx_pkts) tx_chk = _FAIL; - #ifdef CONFIG_ACTIVE_KEEP_ALIVE_CHECK if (pmlmeext->active_keep_alive_check && (rx_chk == _FAIL || tx_chk == _FAIL)) { u8 backup_oper_channel=0; @@ -9354,11 +9343,7 @@ void linked_status_chk(_adapter *padapter) /* back to the original operation channel */ if (backup_oper_channel>0) SelectChannel(padapter, backup_oper_channel); - - } - else - #endif /* CONFIG_ACTIVE_KEEP_ALIVE_CHECK */ - { + } else { if (rx_chk != _SUCCESS) { if (pmlmeext->retry == 0) { #ifdef DBG_EXPIRATION_CHK diff --git a/core/rtw_sta_mgt.c b/core/rtw_sta_mgt.c index 9cf2724..73af419 100644 --- a/core/rtw_sta_mgt.c +++ b/core/rtw_sta_mgt.c @@ -131,13 +131,8 @@ _func_enter_; pstapriv->auth_to = 3; /* 3*2 = 6 sec */ pstapriv->assoc_to = 3; -#ifdef CONFIG_ACTIVE_KEEP_ALIVE_CHECK 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; - #endif _func_exit_; diff --git a/include/autoconf.h b/include/autoconf.h index 8059ccd..c871928 100644 --- a/include/autoconf.h +++ b/include/autoconf.h @@ -30,8 +30,6 @@ #define RTL871X_MODULE_NAME "88EU" #define DRV_NAME "rtl8188eu" -#define CONFIG_USB_HCI - #define CONFIG_RTL8188E #ifdef CONFIG_IOCTL_CFG80211 @@ -43,10 +41,8 @@ * Internal General Config */ -//#define CONFIG_H2CLBK #define CONFIG_EMBEDDED_FWIMG -//#define CONFIG_FILE_FWIMG #define CONFIG_XMIT_ACK #ifdef CONFIG_XMIT_ACK diff --git a/include/rtw_mlme_ext.h b/include/rtw_mlme_ext.h index fd279b0..dd37c69 100644 --- a/include/rtw_mlme_ext.h +++ b/include/rtw_mlme_ext.h @@ -493,11 +493,7 @@ struct mlme_ext_priv //recv_decache check for Action_public frame u8 action_public_dialog_token; u16 action_public_rxseq; - -#ifdef CONFIG_ACTIVE_KEEP_ALIVE_CHECK u8 active_keep_alive_check; -#endif - }; 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 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); u8 judge_network_type(_adapter *padapter, unsigned char *rate, int ratelen); 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 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); u8 rtw_get_oper_ch(_adapter *adapter);