diff --git a/core/rtw_debug.c b/core/rtw_debug.c
index 82a03b6..98bd558 100755
--- a/core/rtw_debug.c
+++ b/core/rtw_debug.c
@@ -1042,7 +1042,7 @@ int proc_get_all_sta_info(char *page, char **start,
 
 #endif
 
-#ifdef CONFIG_FIND_BEST_CHANNEL
+#ifdef CONFIG_AP_MODE
 int proc_get_best_channel(char *page, char **start,
 			  off_t offset, int count,
 			  int *eof, void *data)
@@ -1127,7 +1127,7 @@ int proc_set_best_channel(struct file *file, const char __user *buffer,
 
 	return count;
 }
-#endif /* CONFIG_FIND_BEST_CHANNEL */
+#endif /* CONFIG_AP_MODE */
 #ifdef CONFIG_BT_COEXIST
 #define _bt_dbg_off_		0
 #define _bt_dbg_on_		1
diff --git a/core/rtw_recv.c b/core/rtw_recv.c
index 653dcc6..c10ece2 100755
--- a/core/rtw_recv.c
+++ b/core/rtw_recv.c
@@ -2014,7 +2014,7 @@ sint validate_recv_frame(struct adapter *adapter, union recv_frame *precv_frame)
 
 	u8 *ptr = precv_frame->u.hdr.rx_data;
 	u8  ver =(unsigned char) (*ptr)&0x3 ;
-#ifdef CONFIG_FIND_BEST_CHANNEL
+#ifdef CONFIG_AP_MODE
 	struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv;
 #endif
 
@@ -2032,7 +2032,7 @@ sint validate_recv_frame(struct adapter *adapter, union recv_frame *precv_frame)
 ;
 
 
-#ifdef CONFIG_FIND_BEST_CHANNEL
+#ifdef CONFIG_AP_MODE
 	if (pmlmeext->sitesurvey_res.state == SCAN_PROCESS) {
 		int ch_set_idx = rtw_ch_set_search_ch(pmlmeext->channel_set, rtw_get_oper_ch(adapter));
 		if (ch_set_idx >= 0)
diff --git a/include/autoconf.h b/include/autoconf.h
index 02cf819..ad7fd16 100755
--- a/include/autoconf.h
+++ b/include/autoconf.h
@@ -31,9 +31,6 @@
 #define CONFIG_EMBEDDED_FWIMG
 
 #define CONFIG_AP_MODE
-#ifdef CONFIG_AP_MODE
-	#define CONFIG_FIND_BEST_CHANNEL
-#endif
 
 #define CONFIG_P2P
 #ifdef CONFIG_P2P
diff --git a/include/rtw_debug.h b/include/rtw_debug.h
index ad14d3c..1ac5a9a 100755
--- a/include/rtw_debug.h
+++ b/include/rtw_debug.h
@@ -373,7 +373,7 @@ extern u32 GlobalDebugLevel;
 
 #endif
 
-#ifdef CONFIG_FIND_BEST_CHANNEL
+#ifdef CONFIG_AP_MODE
 	int proc_get_best_channel(char *page, char **start,
 			  off_t offset, int count,
 			  int *eof, void *data);
diff --git a/include/rtw_mlme_ext.h b/include/rtw_mlme_ext.h
index e3fd9a8..77c1306 100755
--- a/include/rtw_mlme_ext.h
+++ b/include/rtw_mlme_ext.h
@@ -439,7 +439,7 @@ typedef struct _RT_CHANNEL_INFO
 	//u16				ScanPeriod;		// Listen time in millisecond in this channel.
 	//s32				MaxTxPwrDbm;	// Max allowed tx power.
 	//u32				ExInfo;			// Extended Information for this channel.
-#ifdef CONFIG_FIND_BEST_CHANNEL
+#ifdef CONFIG_AP_MODE
 	u32				rx_count;
 #endif
 }RT_CHANNEL_INFO, *PRT_CHANNEL_INFO;