diff --git a/Makefile b/Makefile
index 4eb9f33..ecb9144 100755
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,6 @@ CONFIG_INTEL_WIDI = n
 CONFIG_WAPI_SUPPORT = n
 CONFIG_EFUSE_CONFIG_FILE = n
 CONFIG_EXT_CLK = n
-CONFIG_FTP_PROTECT = n
 CONFIG_WOWLAN = n
 CONFIG_GPIO_WAKEUP = n
 CONFIG_ODM_ADAPTIVITY = n
@@ -125,10 +124,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_ODM_ADAPTIVITY), y)
 EXTRA_CFLAGS += -DCONFIG_ODM_ADAPTIVITY
 endif
diff --git a/core/rtw_cmd.c b/core/rtw_cmd.c
index 4595983..f59ed20 100755
--- a/core/rtw_cmd.c
+++ b/core/rtw_cmd.c
@@ -2044,9 +2044,6 @@ static void traffic_status_watchdog(struct adapter *padapter)
 	u16	BusyThreshold = 200;/*  100; */
 	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);
 #ifdef CONFIG_TDLS
 	struct tdls_info *ptdlsinfo = &(padapter->tdlsinfo);
@@ -2086,22 +2083,6 @@ static void traffic_status_watchdog(struct adapter *padapter)
 				bHigherBusyTxTraffic = true;
 		}
 
-#ifdef CONFIG_FTP_PROTECT
-		DBG_871X("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_TRAFFIC_PROTECT
 #define TX_ACTIVE_TH 2
 #define RX_ACTIVE_TH 1
diff --git a/core/rtw_mlme.c b/core/rtw_mlme.c
index e2f815a..bbff562 100755
--- a/core/rtw_mlme.c
+++ b/core/rtw_mlme.c
@@ -90,20 +90,13 @@ sint	_rtw_init_mlme_priv (struct adapter* padapter)
 
 	rtw_clear_scan_deny(padapter);
 
-	#ifdef CONFIG_FTP_PROTECT
-	pmlmepriv->ftp_lock_flag = 0;
-	#endif /* CONFIG_FTP_PROTECT */
-
 	rtw_init_mlme_timer(padapter);
 
 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);
@@ -113,8 +106,7 @@ void rtw_mfree_mlme_priv_lock (struct mlme_priv *pmlmepriv)
 
 static void rtw_free_mlme_ie_data(u8 **ppie, u32 *plen)
 {
-	if(*ppie)
-	{
+	if(*ppie) {
 		rtw_mfree(*ppie, *plen);
 		*plen = 0;
 		*ppie=NULL;
diff --git a/include/rtw_mlme.h b/include/rtw_mlme.h
index 63bea26..5aaaf1e 100755
--- a/include/rtw_mlme.h
+++ b/include/rtw_mlme.h
@@ -559,10 +559,6 @@ struct mlme_priv {
 	u8	p2p_reject_disable;	//When starting NL80211 wpa_supplicant/hostapd, it will call netdev_close
 							//such that it will cause p2p disabled. Use this flag to reject.
 #endif // CONFIG_INTEL_WIDI
-
-#ifdef CONFIG_FTP_PROTECT
-	u8	ftp_lock_flag;
-#endif //CONFIG_FTP_PROTECT
 };
 
 #ifdef CONFIG_AP_MODE