skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-09-20 16:17:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Remove CONFIG_ACTIVE_KEEP_ALIVE_CHECK

Browse source 
This symbol is always defined. In addition, a number of defines that are commented
out in include/autoconf.h have been removed.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-02-20 20:07:27 -06:00
parent 49437ec417
commit 37a28f802f
7 changed files with 47 additions and 201 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

119
core/rtw_ap.c
View file

@ -421,32 +421,8 @@ void expire_timeout_chk(struct 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 */
/* DBG_871X("asoc check by DELBA/ADDBA! (pstapriv->expire_to=%d s)(psta->expire_to=%d s), [%02x, %d]\n", pstapriv->expire_to*2, psta->expire_to*2, psta->htpriv.agg_enable_bitmap, psta->under_exist_checking); */
if ( psta->expire_to <= (pstapriv->expire_to - 50 ) ) {
DBG_871X("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_871X("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)
@ -482,8 +458,6 @@ void expire_timeout_chk(struct 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--;
@ -506,64 +480,59 @@ void expire_timeout_chk(struct 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;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
/* switch to correct channel of current network before issue keep-alive frames */
if (rtw_get_oper_ch(padapter) != pmlmeext->cur_channel) {
backup_oper_channel = rtw_get_oper_ch(padapter);
SelectChannel(padapter, pmlmeext->cur_channel);
}
u8 backup_oper_channel=0; /* issue null data to check sta alive*/
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; for (i = 0; i < chk_alive_num; i++) {
/* switch to correct channel of current network before issue keep-alive frames */ int ret = _FAIL;
if (rtw_get_oper_ch(padapter) != pmlmeext->cur_channel) {
backup_oper_channel = rtw_get_oper_ch(padapter);
SelectChannel(padapter, pmlmeext->cur_channel);
}
/* issue null data to check sta alive*/ psta = rtw_get_stainfo_by_offset(pstapriv, chk_alive_list[i]);
for (i = 0; i < chk_alive_num; i++) { if(!(psta->state &_FW_LINKED))
continue;
int ret = _FAIL; if (psta->state & WIFI_SLEEP_STATE)
ret = issue_nulldata(padapter, psta->hwaddr, 0, 1, 50);
else
ret = issue_nulldata(padapter, psta->hwaddr, 0, 3, 50);
psta = rtw_get_stainfo_by_offset(pstapriv, chk_alive_list[i]); psta->keep_alive_trycnt++;
if(!(psta->state &_FW_LINKED)) if (ret == _SUCCESS)
continue; {
DBG_871X("asoc check, sta(" MAC_FMT ") is alive\n", MAC_ARG(psta->hwaddr));
psta->expire_to = pstapriv->expire_to;
psta->keep_alive_trycnt = 0;
continue;
}
else if (psta->keep_alive_trycnt <= 3)
{
DBG_871X("ack check for asoc expire, keep_alive_trycnt=%d\n", psta->keep_alive_trycnt);
psta->expire_to = 1;
continue;
}
if (psta->state & WIFI_SLEEP_STATE)
ret = issue_nulldata(padapter, psta->hwaddr, 0, 1, 50);
else
ret = issue_nulldata(padapter, psta->hwaddr, 0, 3, 50);
psta->keep_alive_trycnt++;
if (ret == _SUCCESS)
{
DBG_871X("asoc check, sta(" MAC_FMT ") is alive\n", MAC_ARG(psta->hwaddr));
psta->expire_to = pstapriv->expire_to;
psta->keep_alive_trycnt = 0; psta->keep_alive_trycnt = 0;
continue;
} DBG_871X("asoc expire "MAC_FMT", state=0x%x\n", MAC_ARG(psta->hwaddr), psta->state);
else if (psta->keep_alive_trycnt <= 3) _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL);
{ if (rtw_is_list_empty(&psta->asoc_list)==false) {
DBG_871X("ack check for asoc expire, keep_alive_trycnt=%d\n", psta->keep_alive_trycnt); rtw_list_delete(&psta->asoc_list);
psta->expire_to = 1; pstapriv->asoc_list_cnt--;
continue; updated = ap_free_sta(padapter, psta, false, WLAN_REASON_DEAUTH_LEAVING);
}
_exit_critical_bh(&pstapriv->asoc_list_lock, &irqL);
} }
psta->keep_alive_trycnt = 0; if (backup_oper_channel>0) /* back to the original operation channel */
SelectChannel(padapter, backup_oper_channel);
DBG_871X("asoc expire "MAC_FMT", state=0x%x\n", MAC_ARG(psta->hwaddr), psta->state);
_enter_critical_bh(&pstapriv->asoc_list_lock, &irqL);
if (rtw_is_list_empty(&psta->asoc_list)==false) {
rtw_list_delete(&psta->asoc_list);
pstapriv->asoc_list_cnt--;
updated = ap_free_sta(padapter, psta, false, WLAN_REASON_DEAUTH_LEAVING);
}
_exit_critical_bh(&pstapriv->asoc_list_lock, &irqL);
} }
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); associated_clients_update(padapter, updated);
} }

2
core/rtw_cmd.c
View file

@ -2215,14 +2215,12 @@ void dynamic_chk_wk_hdl(struct adapter *padapter, u8 *pbuf, int sz)
padapter = (struct adapter *)pbuf; padapter = (struct 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

@ -2354,15 +2354,6 @@ void rtw_dynamic_check_timer_handlder(struct 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 */
#ifdef CONFIG_BR_EXT #ifdef CONFIG_BR_EXT
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)) #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35))

20
core/rtw_mlme_ext.c
View file

@ -514,17 +514,13 @@ int init_mlme_ext_priv(struct adapter* padapter)
pmlmeext->chan_scan_time = SURVEY_TO; pmlmeext->chan_scan_time = SURVEY_TO;
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
#ifdef DBG_FIXED_CHAN #ifdef DBG_FIXED_CHAN
pmlmeext->fixed_chan = 0xFF; pmlmeext->fixed_chan = 0xFF;
#endif #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)
@ -9826,20 +9822,13 @@ void linked_status_chk(struct adapter *padapter)
rtw_hal_sreset_linked_status_check(padapter); rtw_hal_sreset_linked_status_check(padapter);
#endif #endif
if (is_client_associated_to_ap(padapter)) if (is_client_associated_to_ap(padapter)) {
{
/* linked infrastructure client mode */ /* linked infrastructure client mode */
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
/* Marked by Kurt 20130715 */ /* Marked by Kurt 20130715 */
/* For WiDi 3.5 and latered on, they don't ask WiDi sink to do roaming, so we could not check rx limit that strictly. */ /* For WiDi 3.5 and latered on, they don't ask WiDi sink to do roaming, so we could not check rx limit that strictly. */
@ -9862,7 +9851,6 @@ void linked_status_chk(struct 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;
@ -9885,11 +9873,7 @@ void linked_status_chk(struct 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

4
core/rtw_sta_mgt.c
View file

@ -147,11 +147,7 @@ u32 _rtw_init_sta_priv(struct sta_priv *pstapriv)
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

92
include/autoconf.h
View file

@ -43,36 +43,18 @@
* Internal General Config * Internal General Config
*/ */
//#define CONFIG_H2CLBK
#define CONFIG_EMBEDDED_FWIMG #define CONFIG_EMBEDDED_FWIMG
#define CONFIG_ACTIVE_KEEP_ALIVE_CHECK
#define CONFIG_80211N_HT #define CONFIG_80211N_HT
#define CONFIG_RECV_REORDERING_CTRL #define CONFIG_RECV_REORDERING_CTRL
//#define CONFIG_TCP_CSUM_OFFLOAD_RX
//#define CONFIG_DRVEXT_MODULE
#define CONFIG_SUPPORT_USB_INT #define CONFIG_SUPPORT_USB_INT
#ifdef CONFIG_SUPPORT_USB_INT
//#define CONFIG_USB_INTERRUPT_IN_PIPE
#endif
#define CONFIG_IPS #define CONFIG_IPS
#ifdef CONFIG_IPS
//#define CONFIG_IPS_LEVEL_2 //enable this to set default IPS mode to IPS_LEVEL_2
#endif
#define SUPPORT_HW_RFOFF_DETECTED #define SUPPORT_HW_RFOFF_DETECTED
#define CONFIG_LPS #define CONFIG_LPS
#if defined(CONFIG_LPS) && defined(CONFIG_SUPPORT_USB_INT)
//#define CONFIG_LPS_LCLK
#endif
#ifdef CONFIG_LPS_LCLK #ifdef CONFIG_LPS_LCLK
#define CONFIG_XMIT_THREAD_MODE #define CONFIG_XMIT_THREAD_MODE
@ -101,42 +83,22 @@
#ifndef CONFIG_WIFI_TEST #ifndef CONFIG_WIFI_TEST
#define CONFIG_P2P_REMOVE_GROUP_INFO #define CONFIG_P2P_REMOVE_GROUP_INFO
#endif #endif
//#define CONFIG_DBG_P2P
#define CONFIG_P2P_PS #define CONFIG_P2P_PS
//#define CONFIG_P2P_IPS
#define P2P_OP_CHECK_SOCIAL_CH #define P2P_OP_CHECK_SOCIAL_CH
#endif #endif
// Added by Kurt 20110511
//#define CONFIG_TDLS
#ifdef CONFIG_TDLS
// #ifndef CONFIG_WFD
// #define CONFIG_WFD
// #endif
// #define CONFIG_TDLS_AUTOSETUP
// #define CONFIG_TDLS_AUTOCHECKALIVE
#endif
#define CONFIG_SKB_COPY //for amsdu #define CONFIG_SKB_COPY //for amsdu
//#define CONFIG_LED //#define CONFIG_LED
#ifdef CONFIG_LED #ifdef CONFIG_LED
#define CONFIG_SW_LED #define CONFIG_SW_LED
#ifdef CONFIG_SW_LED
//#define CONFIG_LED_HANDLED_BY_CMD_THREAD
#endif
#endif // CONFIG_LED #endif // CONFIG_LED
#ifdef CONFIG_IOL #ifdef CONFIG_IOL
#define CONFIG_IOL_NEW_GENERATION #define CONFIG_IOL_NEW_GENERATION
#define CONFIG_IOL_READ_EFUSE_MAP #define CONFIG_IOL_READ_EFUSE_MAP
//#define DBG_IOL_READ_EFUSE_MAP
//#define CONFIG_IOL_LLT
#define CONFIG_IOL_EFUSE_PATCH #define CONFIG_IOL_EFUSE_PATCH
//#define CONFIG_IOL_IOREG_CFG
//#define CONFIG_IOL_IOREG_CFG_DBG
#endif #endif
@ -145,12 +107,8 @@
#define CONFIG_LAYER2_ROAMING #define CONFIG_LAYER2_ROAMING
#define CONFIG_LAYER2_ROAMING_RESUME #define CONFIG_LAYER2_ROAMING_RESUME
//#define CONFIG_ADAPTOR_INFO_CACHING_FILE // now just applied on 8192cu only, should make it general...
//#define CONFIG_RESUME_IN_WORKQUEUE
//#define CONFIG_SET_SCAN_DENY_TIMER
#define CONFIG_LONG_DELAY_ISSUE #define CONFIG_LONG_DELAY_ISSUE
#define CONFIG_NEW_SIGNAL_STAT_PROCESS #define CONFIG_NEW_SIGNAL_STAT_PROCESS
//#define CONFIG_SIGNAL_DISPLAY_DBM //display RX signal with dbm
#define RTW_NOTCH_FILTER 0 /* 0:Disable, 1:Enable, */ #define RTW_NOTCH_FILTER 0 /* 0:Disable, 1:Enable, */
#define CONFIG_DEAUTH_BEFORE_CONNECT #define CONFIG_DEAUTH_BEFORE_CONNECT
@ -169,14 +127,10 @@
#endif #endif
#define CONFIG_PREALLOC_RECV_SKB #define CONFIG_PREALLOC_RECV_SKB
//#define CONFIG_REDUCE_USB_TX_INT // Trade-off: Improve performance, but may cause TX URBs blocked by USB Host/Bus driver on few platforms.
//#define CONFIG_EASY_REPLACEMENT
/* /*
* CONFIG_USE_USB_BUFFER_ALLOC_XX uses Linux USB Buffer alloc API and is for Linux platform only now! * CONFIG_USE_USB_BUFFER_ALLOC_XX uses Linux USB Buffer alloc API and is for Linux platform only now!
*/ */
//#define CONFIG_USE_USB_BUFFER_ALLOC_TX // Trade-off: For TX path, improve stability on some platforms, but may cause performance degrade on other platforms.
//#define CONFIG_USE_USB_BUFFER_ALLOC_RX // For RX path
#ifdef CONFIG_USE_USB_BUFFER_ALLOC_RX #ifdef CONFIG_USE_USB_BUFFER_ALLOC_RX
#undef CONFIG_PREALLOC_RECV_SKB #undef CONFIG_PREALLOC_RECV_SKB
#endif #endif
@ -185,15 +139,11 @@
* USB VENDOR REQ BUFFER ALLOCATION METHOD * USB VENDOR REQ BUFFER ALLOCATION METHOD
* if not set we'll use function local variable (stack memory) * if not set we'll use function local variable (stack memory)
*/ */
//#define CONFIG_USB_VENDOR_REQ_BUFFER_DYNAMIC_ALLOCATE
#define CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC #define CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC
#define CONFIG_USB_VENDOR_REQ_MUTEX #define CONFIG_USB_VENDOR_REQ_MUTEX
#define CONFIG_VENDOR_REQ_RETRY #define CONFIG_VENDOR_REQ_RETRY
//#define CONFIG_USB_SUPPORT_ASYNC_VDN_REQ
/* /*
* HAL Related Config * HAL Related Config
*/ */
@ -203,20 +153,13 @@
#define SUPPORTED_BLOCK_IO #define SUPPORTED_BLOCK_IO
#define CONFIG_REGULATORY_CTRL #define CONFIG_REGULATORY_CTRL
//#define CONFIG_ONLY_ONE_OUT_EP_TO_LOW 0
#define CONFIG_OUT_EP_WIFI_MODE 0 #define CONFIG_OUT_EP_WIFI_MODE 0
#define ENABLE_USB_DROP_INCORRECT_OUT #define ENABLE_USB_DROP_INCORRECT_OUT
//#define RTL8192CU_ADHOC_WORKAROUND_SETTING
#define DISABLE_BB_RF 0 #define DISABLE_BB_RF 0
//#define RTL8191C_FPGA_NETWORKTYPE_ADHOC 0 #define MP_DRIVER 0
#define MP_DRIVER 0
/* /*
@ -304,40 +247,7 @@
*/ */
#define DBG 1 #define DBG 1
//#define CONFIG_DEBUG /* DBG_871X, etc... */
//#define CONFIG_DEBUG_RTL871X /* RT_TRACE, RT_PRINT_DATA, _func_enter_, _func_exit_ */
#define CONFIG_PROC_DEBUG #define CONFIG_PROC_DEBUG
#define DBG_CONFIG_ERROR_DETECT #define DBG_CONFIG_ERROR_DETECT
//#define DBG_CONFIG_ERROR_DETECT_INT
#define DBG_CONFIG_ERROR_RESET #define DBG_CONFIG_ERROR_RESET
//#define DBG_IO
//#define DBG_DELAY_OS
//#define DBG_MEM_ALLOC
//#define DBG_IOCTL
//#define DBG_TX
//#define DBG_XMIT_BUF
//#define DBG_XMIT_BUF_EXT
//#define DBG_TX_DROP_FRAME
//#define DBG_TRX_STA_PKTS
//#define DBG_RX_DROP_FRAME
//#define DBG_RX_SEQ
//#define DBG_RX_SIGNAL_DISPLAY_PROCESSING
//#define DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED "jeff-ap"
//#define DBG_SHOW_MCUFWDL_BEFORE_51_ENABLE
//#define DBG_ROAMING_TEST
//#define DBG_HAL_INIT_PROFILING
//TX use 1 urb
//#define CONFIG_SINGLE_XMIT_BUF
//RX use 1 urb
//#define CONFIG_SINGLE_RECV_BUF

2
include/rtw_mlme_ext.h
View file

@ -532,9 +532,7 @@ struct mlme_ext_priv
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
#ifdef DBG_FIXED_CHAN #ifdef DBG_FIXED_CHAN
u8 fixed_chan; u8 fixed_chan;
#endif #endif