rtl8188eu: Remove a few more configuration variables

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

core/rtw_mlme.c

@@ -1938,10 +1938,6 @@ void rtw_dynamic_check_timer_handlder(struct adapter *adapter)
 
 	if (!adapter)
 		return;
-#if defined(CONFIG_CHECK_BT_HANG) && defined(CONFIG_BT_COEXIST)
-	if (adapter->HalFunc.hal_checke_bt_hang)
-		adapter->HalFunc.hal_checke_bt_hang(adapter);
-#endif
 	if (adapter->hw_init_completed == false)
 		return;
 
@@ -1996,11 +1992,7 @@ void rtw_dynamic_check_timer_handlder(struct adapter *adapter)
 #endif	/*  (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)) */
 }
 
-#if defined(IEEE80211_SCAN_RESULT_EXPIRE)
-#define RTW_SCAN_RESULT_EXPIRE IEEE80211_SCAN_RESULT_EXPIRE/HZ*1000 -1000 /* 3000 -1000 */
-#else
 #define RTW_SCAN_RESULT_EXPIRE 2000
-#endif
 
 /*
 * Select a new join candidate from the original @param candidate and @param competitor

core/rtw_mlme_ext.c

@@ -4350,9 +4350,7 @@ int issue_probereq_p2p_ex(struct adapter *adapter, u8 *da, int try_cnt, int wait
 
 	if (ret != _FAIL) {
 		ret = _SUCCESS;
-		#ifndef DBG_XMIT_ACK
 		goto exit;
-		#endif
 	}
 
 	if (try_cnt && wait_ms) {
@@ -5660,9 +5658,7 @@ int issue_probereq_ex(struct adapter *padapter, struct ndis_802_11_ssid *pssid,
 
 	if (ret != _FAIL) {
 		ret = _SUCCESS;
-		#ifndef DBG_XMIT_ACK
 		goto exit;
-		#endif
 	}
 
 	if (try_cnt && wait_ms) {
@@ -6425,9 +6421,7 @@ int issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int pow
 
 	if (ret != _FAIL) {
 		ret = _SUCCESS;
-		#ifndef DBG_XMIT_ACK
 		goto exit;
-		#endif
 	}
 
 	if (try_cnt && wait_ms) {
@@ -6559,9 +6553,7 @@ int issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 tid, int
 
 	if (ret != _FAIL) {
 		ret = _SUCCESS;
-		#ifndef DBG_XMIT_ACK
 		goto exit;
-		#endif
 	}
 
 	if (try_cnt && wait_ms) {
@@ -6675,9 +6667,7 @@ int issue_deauth_ex(struct adapter *padapter, u8 *da, unsigned short reason, int
 
 	if (ret != _FAIL) {
 		ret = _SUCCESS;
-		#ifndef DBG_XMIT_ACK
 		goto exit;
-		#endif
 	}
 
 	if (try_cnt && wait_ms) {
@@ -7561,16 +7551,6 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, str
 
 	}
 
-	#if defined(DBG_RX_SIGNAL_DISPLAY_PROCESSING) & 1
-	if (strcmp(bssid->Ssid.Ssid, DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) == 0) {
-		DBG_88E("Receiving %s(%pM, DSConfig:%u) from ch%u with ss:%3u, sq:%3u, RawRSSI:%3ld\n"
-			, bssid->Ssid.Ssid, bssid->MacAddress, bssid->Configuration.DSConfig
-			, rtw_get_oper_ch(padapter)
-			, bssid->PhyInfo.SignalStrength, bssid->PhyInfo.SignalQuality, bssid->Rssi
-		);
-	}
-	#endif
-
 	/*  mark bss info receving from nearby channel as SignalQuality 101 */
 	if (bssid->Configuration.DSConfig != rtw_get_oper_ch(padapter))
 	{

include/drv_types.h

@@ -259,12 +259,7 @@ struct adapter {
 	struct	pwrctrl_priv	pwrctrlpriv;
 	struct	eeprom_priv eeprompriv;
 	struct	led_priv	ledpriv;
-#if defined(CONFIG_CHECK_BT_HANG) && defined(CONFIG_BT_COEXIST)
+	struct	mp_priv	mppriv;
-	//Check BT status for BT Hung.
-	struct workqueue_struct *priv_checkbt_wq;
-	struct delayed_work checkbt_work;
-#endif
-       struct	mp_priv	mppriv;
 
 #ifdef CONFIG_AP_MODE
 	struct	hostapd_priv	*phostapdpriv;

include/hal_intf.h

@@ -237,12 +237,6 @@ struct hal_ops {
 	void (*hal_reset_security_engine)(struct adapter * adapter);
 	s32 (*c2h_handler)(struct adapter *padapter, struct c2h_evt_hdr *c2h_evt);
 	c2h_id_filter c2h_id_filter_ccx;
-#if defined(CONFIG_CHECK_BT_HANG) && defined(CONFIG_BT_COEXIST)
-	void (*hal_init_checkbthang_workqueue)(struct adapter * padapter);
-	void (*hal_free_checkbthang_workqueue)(struct adapter * padapter);
-	void (*hal_cancel_checkbthang_workqueue)(struct adapter * padapter);
-	void (*hal_checke_bt_hang)(struct adapter * padapter);
-#endif
 };
 
 enum rt_eeprom_type {

os_dep/mlme_linux.c

@@ -59,11 +59,6 @@ void rtw_init_mlme_timer(struct adapter *padapter)
 	_init_timer(&(pmlmepriv->scan_to_timer), padapter->pnetdev, _rtw_scan_timeout_handler, padapter);
 
 	_init_timer(&(pmlmepriv->dynamic_chk_timer), padapter->pnetdev, _dynamic_check_timer_handlder, padapter);
-
-#if defined(CONFIG_CHECK_BT_HANG) && defined(CONFIG_BT_COEXIST)
-	if (padapter->HalFunc.hal_init_checkbthang_workqueue)
-		padapter->HalFunc.hal_init_checkbthang_workqueue(padapter);
-#endif
 }
 
 void rtw_os_indicate_connect(struct adapter *adapter)

os_dep/os_intfs.c

@@ -1054,10 +1054,6 @@ void rtw_cancel_all_timer(struct adapter *padapter)
 	_cancel_timer_ex(&padapter->pwrctrlpriv.pwr_state_check_timer);
 
 	_cancel_timer_ex(&padapter->recvpriv.signal_stat_timer);
-#if defined(CONFIG_CHECK_BT_HANG) && defined(CONFIG_BT_COEXIST)
-	if (padapter->HalFunc.hal_cancel_checkbthang_workqueue)
-		padapter->HalFunc.hal_cancel_checkbthang_workqueue(padapter);
-#endif
 	//cancel dm timer
 	rtw_hal_dm_deinit(padapter);
 }
@@ -1093,10 +1089,6 @@ u8 rtw_free_drv_sw(struct adapter *padapter)
 	rtw_free_evt_priv(&padapter->evtpriv);
 
 	rtw_free_mlme_priv(&padapter->mlmepriv);
-#if defined(CONFIG_CHECK_BT_HANG) && defined(CONFIG_BT_COEXIST)
-	if (padapter->HalFunc.hal_free_checkbthang_workqueue)
-		padapter->HalFunc.hal_free_checkbthang_workqueue(padapter);
-#endif
 	_rtw_free_xmit_priv(&padapter->xmitpriv);
 
 	_rtw_free_sta_priv(&padapter->stapriv); //will free bcmc_stainfo here