rtl8192du: Remove symbols DBG_ROAMING_TEST and CONFIG_ACTIVE_KEEP_ALI…

…VE_CHECK Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
lwfinger · Jul 11, 2014 · b9e1dec · b9e1dec
1 parent fff106c
commit b9e1dec
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 53 deletions.
diff --git a/core/rtw_ap.c b/core/rtw_ap.c
@@ -338,28 +338,7 @@ void	expire_timeout_chk(struct rtw_adapter *padapter)
 			psta->expire_to--;
 		}
 
-#ifndef CONFIG_ACTIVE_KEEP_ALIVE_CHECK
-		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_8192D("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_8192D("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_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) {
@@ -391,7 +370,6 @@ void	expire_timeout_chk(struct rtw_adapter *padapter)
 
 				continue;
 			}
-			#endif /* CONFIG_ACTIVE_KEEP_ALIVE_CHECK */
 
 			list_del_init(&psta->asoc_list);
 			pstapriv->asoc_list_cnt--;
@@ -413,7 +391,6 @@ void	expire_timeout_chk(struct rtw_adapter *padapter)
 
 	spin_unlock_bh(&pstapriv->asoc_list_lock);
 
-#ifdef CONFIG_ACTIVE_KEEP_ALIVE_CHECK
 	if (chk_alive_num) {
 		u8 backup_oper_channel = 0;
 		struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@@ -460,7 +437,6 @@ void	expire_timeout_chk(struct rtw_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
@@ -1740,12 +1740,10 @@ static void dynamic_chk_wk_hdl(struct rtw_adapter *padapter, u8 *pbuf, int sz)
 
 	pmlmepriv = &(padapter->mlmepriv);
 
-#ifdef CONFIG_ACTIVE_KEEP_ALIVE_CHECK
 #ifdef CONFIG_92D_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
@@ -2083,13 +2083,6 @@ void rtw_dynamic_check_timer_handlder(struct rtw_adapter *adapter)
 			rtw_auto_scan_handler(adapter);
 		}
 	}
-#ifndef CONFIG_ACTIVE_KEEP_ALIVE_CHECK
-#ifdef CONFIG_92D_AP_MODE
-	if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) {
-		expire_timeout_chk(adapter);
-	}
-#endif
-#endif /* CONFIG_ACTIVE_KEEP_ALIVE_CHECK */
 }
 
 #ifdef CONFIG_SET_SCAN_DENY_TIMER

diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c
@@ -532,10 +532,7 @@ int init_mlme_ext_priv(struct rtw_adapter *adapt)
 	pmlmeext->chan_scan_time = SURVEY_TO;
 	pmlmeext->mlmeext_init = true;
 
-#ifdef CONFIG_ACTIVE_KEEP_ALIVE_CHECK
 	pmlmeext->active_keep_alive_check = true;
-#endif
-
 	return res;
 }
 
@@ -9871,13 +9868,7 @@ void linked_status_chk(struct rtw_adapter *adapt)
 		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
 
 		psta = rtw_get_stainfo(pstapriv, pmlmeinfo->network.MacAddress);
 		if (psta != NULL) {
@@ -9894,7 +9885,6 @@ void linked_status_chk(struct rtw_adapter *adapt)
 			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;
@@ -9930,9 +9920,7 @@ void linked_status_chk(struct rtw_adapter *adapt)
 					SelectChannel(adapt,
 						      backup_oper_channel);
 
-			} else
-#endif /* CONFIG_ACTIVE_KEEP_ALIVE_CHECK */
-			{
+			} else {
 				if (rx_chk != _SUCCESS) {
 					if (pmlmeext->retry == 0) {
 						issue_probereq(adapt,

diff --git a/core/rtw_sta_mgt.c b/core/rtw_sta_mgt.c
@@ -116,11 +116,7 @@ u32	_rtw_init_sta_priv(struct	sta_priv *pstapriv)
 
 	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

diff --git a/include/rtw_mlme_ext.h b/include/rtw_mlme_ext.h
@@ -466,10 +466,7 @@ struct mlme_ext_priv
 	u8 update_channel_plan_by_ap_done;
 #endif
 
-#ifdef CONFIG_ACTIVE_KEEP_ALIVE_CHECK
 	u8 active_keep_alive_check;
-#endif
-
 };
 
 int init_mlme_ext_priv(struct rtw_adapter *padapter);