From cc8740eb700821ce62fe181b80ac2ffed85ee247 Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Tue, 24 Feb 2015 10:01:42 -0600
Subject: [PATCH] rtl8188eu: Remove CONFIG_SET_SCAN_DENY_TIMER

This one is always defined.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
---
 core/rtw_mlme.c     | 2 --
 include/autoconf.h  | 8 --------
 include/rtw_mlme.h  | 9 ---------
 os_dep/mlme_linux.c | 4 ----
 os_dep/os_intfs.c   | 2 --
 5 files changed, 25 deletions(-)

diff --git a/core/rtw_mlme.c b/core/rtw_mlme.c
index f5f85ec..a99443b 100755
--- a/core/rtw_mlme.c
+++ b/core/rtw_mlme.c
@@ -2379,7 +2379,6 @@ void rtw_dynamic_check_timer_handlder(struct adapter *adapter)
 }
 
 
-#ifdef CONFIG_SET_SCAN_DENY_TIMER
 inline bool rtw_is_scan_deny(struct adapter *adapter)
 {
 	struct mlme_priv *mlmepriv = &adapter->mlmepriv;
@@ -2407,7 +2406,6 @@ void rtw_set_scan_deny(struct adapter *adapter, u32 ms)
 	_set_timer(&mlmepriv->set_scan_deny_timer, ms);
 
 }
-#endif
 
 #ifdef CONFIG_DETECT_C2H_BY_POLLING
 void rtw_event_polling_timer_hdl(struct adapter *adapter)
diff --git a/include/autoconf.h b/include/autoconf.h
index 41c3658..aa89425 100755
--- a/include/autoconf.h
+++ b/include/autoconf.h
@@ -18,20 +18,12 @@
  *
  ******************************************************************************/
 
-//***** temporarily flag *******
 /*
  * Public  General Config
  */
-#define AUTOCONF_INCLUDED
 #define RTL871X_MODULE_NAME "88EU"
 #define DRV_NAME "rtl8188eu"
 
-#define CONFIG_USB_HCI
-
-#define CONFIG_RTL8188E
-
-#define CONFIG_SET_SCAN_DENY_TIMER
-
 /*
  * Internal  General Config
  */
diff --git a/include/rtw_mlme.h b/include/rtw_mlme.h
index 65e0da8..c5331b5 100755
--- a/include/rtw_mlme.h
+++ b/include/rtw_mlme.h
@@ -423,10 +423,8 @@ struct mlme_priv {
 	_timer scan_to_timer; // driver itself handles scan_timeout status.
 	u32 scan_start_time; // used to evaluate the time spent in scanning
 
-	#ifdef CONFIG_SET_SCAN_DENY_TIMER
 	_timer set_scan_deny_timer;
 	ATOMIC_T set_scan_deny; //0: allowed, 1: deny
-	#endif
 
 	#ifdef CONFIG_DETECT_C2H_BY_POLLING
 	_timer event_polling_timer;
@@ -729,17 +727,10 @@ extern void _rtw_join_timeout_handler(struct adapter *adapter);
 extern void rtw_scan_timeout_handler(struct adapter *adapter);
 
 extern void rtw_dynamic_check_timer_handlder(struct adapter *adapter);
-#ifdef CONFIG_SET_SCAN_DENY_TIMER
 bool rtw_is_scan_deny(struct adapter *adapter);
 void rtw_clear_scan_deny(struct adapter *adapter);
 void rtw_set_scan_deny_timer_hdl(struct adapter *adapter);
 void rtw_set_scan_deny(struct adapter *adapter, u32 ms);
-#else
-#define rtw_is_scan_deny(adapter) false
-#define rtw_clear_scan_deny(adapter) do {} while (0)
-#define rtw_set_scan_deny_timer_hdl(adapter) do {} while (0)
-#define rtw_set_scan_deny(adapter, ms) do {} while (0)
-#endif
 
 #ifdef CONFIG_DETECT_C2H_BY_POLLING
 extern void rtw_event_polling_timer_hdl(struct adapter *adapter);
diff --git a/os_dep/mlme_linux.c b/os_dep/mlme_linux.c
index 1927cc2..b63304f 100755
--- a/os_dep/mlme_linux.c
+++ b/os_dep/mlme_linux.c
@@ -104,13 +104,11 @@ if (adapter->registrypriv.mp_mode == 1)
 	_set_timer(&adapter->mlmepriv.dynamic_chk_timer, 2000);
 }
 
-#ifdef CONFIG_SET_SCAN_DENY_TIMER
 static void _rtw_set_scan_deny_timer_hdl(void *FunctionContext)
 {
 	struct adapter *adapter = (struct adapter *)FunctionContext;
 	rtw_set_scan_deny_timer_hdl(adapter);
 }
-#endif
 
 #ifdef CONFIG_DETECT_C2H_BY_POLLING
 void _rtw_event_polling_timer_hdl(void *FunctionContext)
@@ -133,9 +131,7 @@ void rtw_init_mlme_timer(struct adapter *padapter)
 
 	_init_timer(&(pmlmepriv->dynamic_chk_timer), padapter->pnetdev, _dynamic_check_timer_handlder, padapter);
 
-	#ifdef CONFIG_SET_SCAN_DENY_TIMER
 	_init_timer(&(pmlmepriv->set_scan_deny_timer), padapter->pnetdev, _rtw_set_scan_deny_timer_hdl, padapter);
-	#endif
 
 #ifdef CONFIG_DETECT_C2H_BY_POLLING
 	_init_timer(&(pmlmepriv->event_polling_timer), padapter->pnetdev, _rtw_event_polling_timer_hdl, padapter);
diff --git a/os_dep/os_intfs.c b/os_dep/os_intfs.c
index 8e10ec0..6cebca2 100755
--- a/os_dep/os_intfs.c
+++ b/os_dep/os_intfs.c
@@ -1049,11 +1049,9 @@ void rtw_cancel_all_timer(struct adapter *padapter)
 	_cancel_timer_ex(&padapter->cfg80211_wdinfo.remain_on_ch_timer);
 #endif /* CONFIG_P2P */
 
-#ifdef CONFIG_SET_SCAN_DENY_TIMER
 	_cancel_timer_ex(&padapter->mlmepriv.set_scan_deny_timer);
 	rtw_clear_scan_deny(padapter);
 	RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel set_scan_deny_timer! \n"));
-#endif
 
 #ifdef CONFIG_NEW_SIGNAL_STAT_PROCESS
 	_cancel_timer_ex(&padapter->recvpriv.signal_stat_timer);