From eba06c170867fa5ecded2218de6f2c63c823ce81 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Sat, 28 Feb 2015 16:02:57 -0600 Subject: [PATCH] rtl8188eu: Remove CONFIG_WIFI_TEST The one is never selected. Signed-off-by: Larry Finger --- Makefile | 5 ----- core/rtw_mlme_ext.c | 10 +--------- include/autoconf.h | 4 +--- os_dep/os_intfs.c | 4 ---- 4 files changed, 2 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index fc92d8d..bb523d5 100755 --- a/Makefile +++ b/Makefile @@ -21,7 +21,6 @@ CONFIG_USB_HCI = y CONFIG_POWER_SAVING = y CONFIG_USB_AUTOSUSPEND = n CONFIG_HW_PWRP_DETECTION = n -CONFIG_WIFI_TEST = n CONFIG_BT_COEXIST = n CONFIG_INTEL_WIDI = n CONFIG_WAPI_SUPPORT = n @@ -107,10 +106,6 @@ ifeq ($(CONFIG_HW_PWRP_DETECTION), y) EXTRA_CFLAGS += -DCONFIG_HW_PWRP_DETECTION endif -ifeq ($(CONFIG_WIFI_TEST), y) -EXTRA_CFLAGS += -DCONFIG_WIFI_TEST -endif - ifeq ($(CONFIG_BT_COEXIST), y) EXTRA_CFLAGS += -DCONFIG_BT_COEXIST endif diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c index 428c4af..e13ee2f 100755 --- a/core/rtw_mlme_ext.c +++ b/core/rtw_mlme_ext.c @@ -787,15 +787,7 @@ unsigned int OnProbeReq(struct adapter *padapter, union recv_frame *precv_frame) /* Commented by Kurt 2012/10/16 */ /* IOT issue: Google Nexus7 use 1M rate to send p2p_probe_req after GO nego completed and Nexus7 is client */ -#ifdef CONFIG_WIFI_TEST - if ( pattrib->mcs_rate <= 3 ) - { - wifi_test_chk_rate = 0; - } -#endif /* CONFIG_WIFI_TEST */ - - if( wifi_test_chk_rate == 1 ) - { + if( wifi_test_chk_rate == 1 ) { if((is_valid_p2p_probereq = process_probe_req_p2p_ie(pwdinfo, pframe, len)) == true) { if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_DEVICE)) diff --git a/include/autoconf.h b/include/autoconf.h index 60a4bfa..b229aee 100755 --- a/include/autoconf.h +++ b/include/autoconf.h @@ -44,9 +44,7 @@ //The CONFIG_WFD is for supporting the Wi-Fi display #define CONFIG_WFD - #ifndef CONFIG_WIFI_TEST - #define CONFIG_P2P_REMOVE_GROUP_INFO - #endif + #define CONFIG_P2P_REMOVE_GROUP_INFO #define CONFIG_P2P_PS #define P2P_OP_CHECK_SOCIAL_CH diff --git a/os_dep/os_intfs.c b/os_dep/os_intfs.c index bb276f7..bb377f9 100755 --- a/os_dep/os_intfs.c +++ b/os_dep/os_intfs.c @@ -113,11 +113,7 @@ static int rtw_lowrate_two_xmit = 1;/* Use 2 path Tx to transmit MCS0~7 and lega /* int rf_config = RF_1T2R; 1T2R */ static int rtw_rf_config = RF_819X_MAX_TYPE; /* auto */ static int rtw_low_power = 0; -#ifdef CONFIG_WIFI_TEST -static int rtw_wifi_spec = 1;/* for wifi test */ -#else static int rtw_wifi_spec = 0; -#endif static int rtw_channel_plan = RT_CHANNEL_DOMAIN_MAX; #ifdef CONFIG_BT_COEXIST