From 974a7681335369116fc2359fbec38e5f7e5e534e Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Sat, 20 Jul 2013 17:26:42 -0500 Subject: [PATCH] rtl8188eu: Remove CONFIG_FTP_PROTECT - not defined Signed-off-by: Larry Finger --- Makefile | 5 ----- core/rtw_cmd.c | 19 ------------------- core/rtw_mlme.c | 5 ----- include/rtw_mlme.h | 6 ------ 4 files changed, 35 deletions(-) diff --git a/Makefile b/Makefile index 4ca1b30..2491928 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,6 @@ CONFIG_HW_PWRP_DETECTION = n CONFIG_BT_COEXIST = n CONFIG_EFUSE_CONFIG_FILE = n CONFIG_EXT_CLK = n -CONFIG_FTP_PROTECT = n CONFIG_WOWLAN = n CONFIG_DRVEXT_MODULE = n @@ -122,10 +121,6 @@ ifeq ($(CONFIG_EXT_CLK), y) EXTRA_CFLAGS += -DCONFIG_EXT_CLK endif -ifeq ($(CONFIG_FTP_PROTECT), y) -EXTRA_CFLAGS += -DCONFIG_FTP_PROTECT -endif - ifeq ($(CONFIG_WOWLAN), y) EXTRA_CFLAGS += -DCONFIG_WOWLAN endif diff --git a/core/rtw_cmd.c b/core/rtw_cmd.c index 7386331..2679b18 100644 --- a/core/rtw_cmd.c +++ b/core/rtw_cmd.c @@ -1828,9 +1828,6 @@ static void traffic_status_watchdog(_adapter *padapter) u8 bEnterPS; u8 bBusyTraffic = false, bTxBusyTraffic = false, bRxBusyTraffic = false; u8 bHigherBusyTraffic = false, bHigherBusyRxTraffic = false, bHigherBusyTxTraffic = false; -#ifdef CONFIG_FTP_PROTECT - u16 bPktCount = 0; -#endif struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); /* */ @@ -1868,22 +1865,6 @@ static void traffic_status_watchdog(_adapter *padapter) bHigherBusyTxTraffic = true; } -#ifdef CONFIG_FTP_PROTECT - DBG_88E("RX in period:%d, TX in period:%d, ftp_lock_flag:%d\n", - pmlmepriv->LinkDetectInfo.NumRxOkInPeriod, - pmlmepriv->LinkDetectInfo.NumTxOkInPeriod, - pmlmepriv->ftp_lock_flag); - - bPktCount = pmlmepriv->LinkDetectInfo.NumRxOkInPeriod + pmlmepriv->LinkDetectInfo.NumTxOkInPeriod; - if (bPktCount > 20 && !pmlmepriv->ftp_lock_flag) { - pmlmepriv->ftp_lock_flag = 1; - rtw_lock_suspend(); - } else if (bPktCount == 0 && pmlmepriv->ftp_lock_flag) { - pmlmepriv->ftp_lock_flag = 0; - rtw_unlock_suspend(); - } -#endif /* CONFIG_KEEP_FTP_TRANSMIT */ - #ifdef CONFIG_BT_COEXIST if (BT_1Ant(padapter) == false) #endif diff --git a/core/rtw_mlme.c b/core/rtw_mlme.c index 119b2d0..561e6f6 100644 --- a/core/rtw_mlme.c +++ b/core/rtw_mlme.c @@ -89,10 +89,6 @@ _func_enter_; rtw_clear_scan_deny(padapter); - #ifdef CONFIG_FTP_PROTECT - pmlmepriv->ftp_lock_flag = 0; - #endif /* CONFIG_FTP_PROTECT */ - rtw_init_mlme_timer(padapter); exit: @@ -102,7 +98,6 @@ _func_exit_; return res; } -void rtw_mfree_mlme_priv_lock (struct mlme_priv *pmlmepriv); void rtw_mfree_mlme_priv_lock (struct mlme_priv *pmlmepriv) { _rtw_spinlock_free(&pmlmepriv->lock); diff --git a/include/rtw_mlme.h b/include/rtw_mlme.h index 4ce2a8a..ea9d2ed 100644 --- a/include/rtw_mlme.h +++ b/include/rtw_mlme.h @@ -429,13 +429,7 @@ struct mlme_priv { u32 p2p_assoc_req_ie_len; _lock bcn_update_lock; u8 update_bcn; - - #endif //#if defined (CONFIG_AP_MODE) - -#ifdef CONFIG_FTP_PROTECT - u8 ftp_lock_flag; -#endif //CONFIG_FTP_PROTECT }; #ifdef CONFIG_AP_MODE