From d2528caa5f8abe90a32a77844eaf8e3ff367e16f Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Fri, 19 Jul 2013 17:13:46 -0500 Subject: [PATCH] rtl8188eu: Remove CONFIG_FIND_BEST_CHANNEL This variable is selected. Signed-off-by: Larry Finger --- core/rtw_debug.c | 2 -- core/rtw_mlme_ext.c | 3 --- core/rtw_recv.c | 5 ----- include/autoconf.h | 1 - include/rtw_debug.h | 2 -- include/rtw_mlme_ext.h | 2 -- os_dep/os_intfs.c | 4 ---- 7 files changed, 19 deletions(-) diff --git a/core/rtw_debug.c b/core/rtw_debug.c index 4f5e1e8..211f2f4 100644 --- a/core/rtw_debug.c +++ b/core/rtw_debug.c @@ -1006,7 +1006,6 @@ int proc_get_all_sta_info(char *page, char **start, } #endif -#ifdef CONFIG_FIND_BEST_CHANNEL int proc_get_best_channel(char *page, char **start, off_t offset, int count, int *eof, void *data) @@ -1066,7 +1065,6 @@ int proc_get_best_channel(char *page, char **start, return len; } -#endif /* CONFIG_FIND_BEST_CHANNEL */ #ifdef CONFIG_BT_COEXIST #define _bt_dbg_off_ 0 #define _bt_dbg_on_ 1 diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c index 44b1c55..a5345d0 100644 --- a/core/rtw_mlme_ext.c +++ b/core/rtw_mlme_ext.c @@ -9937,9 +9937,6 @@ u8 sitesurvey_cmd_hdl(_adapter *padapter, u8 *pbuf) if ((pmlmeext->sitesurvey_res.state == SCAN_START) || (pmlmeext->sitesurvey_res.state == SCAN_TXNULL)) { -#ifdef CONFIG_FIND_BEST_CHANNEL -#endif /* CONFIG_FIND_BEST_CHANNEL */ - /* disable dynamic functions, such as high power, DIG */ Save_DM_Func_Flag(padapter); Switch_DM_Func(padapter, DYNAMIC_FUNC_DISABLE, false); diff --git a/core/rtw_recv.c b/core/rtw_recv.c index 9b33d18..f8eb1bb 100644 --- a/core/rtw_recv.c +++ b/core/rtw_recv.c @@ -1615,20 +1615,15 @@ sint validate_recv_frame(_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 struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; -#endif _func_enter_; - -#ifdef CONFIG_FIND_BEST_CHANNEL 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) pmlmeext->channel_set[ch_set_idx].rx_count++; } -#endif /* add version chk */ if (ver!=0){ diff --git a/include/autoconf.h b/include/autoconf.h index 69c4f3e..5198e9c 100644 --- a/include/autoconf.h +++ b/include/autoconf.h @@ -64,7 +64,6 @@ #endif #define CONFIG_NATIVEAP_MLME - #define CONFIG_FIND_BEST_CHANNEL #endif #define CONFIG_P2P diff --git a/include/rtw_debug.h b/include/rtw_debug.h index dff8f62..f6d2dac 100644 --- a/include/rtw_debug.h +++ b/include/rtw_debug.h @@ -323,11 +323,9 @@ extern u32 GlobalDebugLevel; #endif -#ifdef CONFIG_FIND_BEST_CHANNEL int proc_get_best_channel(char *page, char **start, off_t offset, int count, int *eof, void *data); -#endif int proc_get_rx_signal(char *page, char **start, off_t offset, int count, diff --git a/include/rtw_mlme_ext.h b/include/rtw_mlme_ext.h index dd37c69..eee9642 100644 --- a/include/rtw_mlme_ext.h +++ b/include/rtw_mlme_ext.h @@ -404,9 +404,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 u32 rx_count; -#endif }RT_CHANNEL_INFO, *PRT_CHANNEL_INFO; int rtw_ch_set_search_ch(RT_CHANNEL_INFO *ch_set, const u32 ch); diff --git a/os_dep/os_intfs.c b/os_dep/os_intfs.c index 1e62176..c8979b5 100644 --- a/os_dep/os_intfs.c +++ b/os_dep/os_intfs.c @@ -494,14 +494,12 @@ void rtw_proc_init_one(struct net_device *dev) } #endif -#ifdef CONFIG_FIND_BEST_CHANNEL entry = create_proc_read_entry("best_channel", S_IFREG | S_IRUGO, dir_dev, proc_get_best_channel, dev); if (!entry) { pr_info("Unable to create_proc_read_entry!\n"); return; } -#endif entry = create_proc_read_entry("rx_signal", S_IFREG | S_IRUGO, dir_dev, proc_get_rx_signal, dev); @@ -606,9 +604,7 @@ void rtw_proc_remove_one(struct net_device *dev) remove_proc_entry("all_sta_info", dir_dev); #endif -#ifdef CONFIG_FIND_BEST_CHANNEL remove_proc_entry("best_channel", dir_dev); -#endif remove_proc_entry("rx_signal", dir_dev); #ifdef CONFIG_80211N_HT remove_proc_entry("cbw40_enable", dir_dev);