diff --git a/core/rtw_cmd.c b/core/rtw_cmd.c
index 569229e..0cf3c2d 100755
--- a/core/rtw_cmd.c
+++ b/core/rtw_cmd.c
@@ -1939,20 +1939,13 @@ void dynamic_chk_wk_hdl(struct adapter *padapter, u8 *pbuf, int sz)
 	}
 #endif
 
-	#ifdef DBG_CONFIG_ERROR_DETECT
 	rtw_hal_sreset_xmit_status_check(padapter);
-	#endif
 
-	/* if(check_fwstate(pmlmepriv, _FW_UNDER_LINKING|_FW_UNDER_SURVEY)==false) */
-	{
-		linked_status_chk(padapter);
-		traffic_status_watchdog(padapter);
-	}
+	linked_status_chk(padapter);
+	traffic_status_watchdog(padapter);
 
 	rtw_hal_dm_watchdog(padapter);
 
-	/* check_hw_pbc(padapter, pdrvextra_cmd->pbuf, pdrvextra_cmd->type_size); */
-
 #ifdef CONFIG_BT_COEXIST
 	/*  */
 	/*  BT-Coexist */
diff --git a/core/rtw_debug.c b/core/rtw_debug.c
index a8071c3..d342087 100755
--- a/core/rtw_debug.c
+++ b/core/rtw_debug.c
@@ -21,6 +21,7 @@
 
 
 #include <rtw_debug.h>
+#include <rtw_sreset.h>
 
 #ifdef CONFIG_DEBUG_RTL871X
 
@@ -1177,8 +1178,6 @@ int proc_set_btcoex_dbg(struct file *file, const char __user *buffer,
 }
 #endif /* CONFIG_BT_COEXIST */
 
-#if defined(DBG_CONFIG_ERROR_DETECT)
-#include <rtw_sreset.h>
 int proc_get_sreset(char *page, char **start, off_t offset, int count, int *eof, void *data)
 {
 	struct net_device *dev = data;
@@ -1214,7 +1213,6 @@ int proc_set_sreset(struct file *file, const char __user *buffer, unsigned long
 	return count;
 
 }
-#endif /* DBG_CONFIG_ERROR_DETECT */
 
 int proc_get_odm_dbg_comp(char *page, char **start, off_t offset, int count, int *eof, void *data)
 {
diff --git a/core/rtw_mlme.c b/core/rtw_mlme.c
index d2c2d88..0c42b78 100755
--- a/core/rtw_mlme.c
+++ b/core/rtw_mlme.c
@@ -1175,15 +1175,6 @@ void rtw_surveydone_event_callback(struct adapter	*adapter, u8 *pbuf)
 	drvext_surveydone_callback(&adapter->drvextpriv);
 #endif
 
-#ifdef DBG_CONFIG_ERROR_DETECT
-	{
-		struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv;
-		if(pmlmeext->sitesurvey_res.bss_cnt == 0){
-			/* rtw_hal_sreset_reset(adapter); */
-		}
-	}
-#endif
-
 	rtw_cfg80211_surveydone_event_callback(adapter);
 }
 
diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c
index 3984c75..3d77e23 100755
--- a/core/rtw_mlme_ext.c
+++ b/core/rtw_mlme_ext.c
@@ -9572,9 +9572,7 @@ void linked_status_chk(struct adapter *padapter)
 	if(padapter->bRxRSSIDisplay)
 		 _linked_rx_signal_strehgth_display(padapter);
 
-	#ifdef DBG_CONFIG_ERROR_DETECT
 	rtw_hal_sreset_linked_status_check(padapter);
-	#endif
 
 	if (is_client_associated_to_ap(padapter)) {
 		/* linked infrastructure client mode */
diff --git a/core/rtw_pwrctrl.c b/core/rtw_pwrctrl.c
index 09052d9..dd3721e 100755
--- a/core/rtw_pwrctrl.c
+++ b/core/rtw_pwrctrl.c
@@ -923,7 +923,6 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *cal
 			DBG_871X("%s wait ps_processing done\n", __func__);
 	}
 
-#ifdef DBG_CONFIG_ERROR_DETECT
 	if (rtw_hal_sreset_inprogress(padapter)) {
 		DBG_871X("%s wait sreset_inprogress...\n", __func__);
 		while (rtw_hal_sreset_inprogress(padapter) && rtw_get_passing_time_ms(start) <= 4000)
@@ -933,8 +932,6 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *cal
 		else
 			DBG_871X("%s wait sreset_inprogress done\n", __func__);
 	}
-#endif
-
 	if (pwrpriv->bInternalAutoSuspend == false && pwrpriv->bInSuspend) {
 		DBG_871X("%s wait bInSuspend...\n", __func__);
 		while (pwrpriv->bInSuspend
diff --git a/core/rtw_sreset.c b/core/rtw_sreset.c
index fee0727..b773728 100755
--- a/core/rtw_sreset.c
+++ b/core/rtw_sreset.c
@@ -22,7 +22,6 @@
 
 void sreset_init_value(struct adapter *padapter)
 {
-#if defined(DBG_CONFIG_ERROR_DETECT)
 	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
 	struct sreset_priv *psrtpriv = &pHalData->srestpriv;
 
@@ -31,11 +30,9 @@ void sreset_init_value(struct adapter *padapter)
 	psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS;
 	psrtpriv->last_tx_time =0;
 	psrtpriv->last_tx_complete_time =0;
-#endif
 }
 void sreset_reset_value(struct adapter *padapter)
 {
-#if defined(DBG_CONFIG_ERROR_DETECT)
 	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
 	struct sreset_priv *psrtpriv = &pHalData->srestpriv;
 
@@ -43,12 +40,10 @@ void sreset_reset_value(struct adapter *padapter)
 	psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS;
 	psrtpriv->last_tx_time =0;
 	psrtpriv->last_tx_complete_time =0;
-#endif
 }
 
 u8 sreset_get_wifi_status(struct adapter *padapter)
 {
-#if defined(DBG_CONFIG_ERROR_DETECT)
 	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
 	struct sreset_priv *psrtpriv = &pHalData->srestpriv;
 
@@ -79,25 +74,18 @@ u8 sreset_get_wifi_status(struct adapter *padapter)
 	psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS;
 
 	return status;
-#else
-	return WIFI_STATUS_SUCCESS;
-#endif
 }
 
 void sreset_set_wifi_error_status(struct adapter *padapter, u32 status)
 {
-#if defined(DBG_CONFIG_ERROR_DETECT)
 	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
 	pHalData->srestpriv.Wifi_Error_Status = status;
-#endif
 }
 
 void sreset_set_trigger_point(struct adapter *padapter, s32 tgp)
 {
-#if defined(DBG_CONFIG_ERROR_DETECT)
 	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
 	pHalData->srestpriv.dbg_trigger_point = tgp;
-#endif
 }
 
 bool sreset_inprogress(struct adapter *padapter)
diff --git a/hal/hal_intf.c b/hal/hal_intf.c
index a21388d..5437515 100755
--- a/hal/hal_intf.c
+++ b/hal/hal_intf.c
@@ -49,18 +49,21 @@ void rtw_hal_def_value_init(struct adapter *padapter)
 		if(padapter->HalFunc.init_default_value)
 			padapter->HalFunc.init_default_value(padapter);
 }
+
 void	rtw_hal_free_data(struct adapter *padapter)
 {
 	if (is_primary_adapter(padapter))
 		if(padapter->HalFunc.free_hal_data)
 			padapter->HalFunc.free_hal_data(padapter);
 }
+
 void	rtw_hal_dm_init(struct adapter *padapter)
 {
 	if (is_primary_adapter(padapter))
 		if(padapter->HalFunc.dm_init)
 			padapter->HalFunc.dm_init(padapter);
 }
+
 void rtw_hal_dm_deinit(struct adapter *padapter)
 {
 	/*  cancel dm  timer */
@@ -68,6 +71,7 @@ void rtw_hal_dm_deinit(struct adapter *padapter)
 		if(padapter->HalFunc.dm_deinit)
 			padapter->HalFunc.dm_deinit(padapter);
 }
+
 void	rtw_hal_sw_led_init(struct adapter *padapter)
 {
 	if(padapter->HalFunc.InitSwLeds)
@@ -86,13 +90,13 @@ u32 rtw_hal_power_on(struct adapter *padapter)
 		return padapter->HalFunc.hal_power_on(padapter);
 	return _FAIL;
 }
+
 void rtw_hal_power_off(struct adapter *padapter)
 {
 	if(padapter->HalFunc.hal_power_off)
 		padapter->HalFunc.hal_power_off(padapter);
 }
 
-
 uint	 rtw_hal_init(struct adapter *padapter)
 {
 	uint	status = _SUCCESS;
@@ -153,9 +157,6 @@ uint rtw_hal_deinit(struct adapter *padapter)
 	{
 		DBG_871X("\n rtw_hal_deinit: hal_init fail\n");
 	}
-
-;
-
 	return status;
 }
 
@@ -177,6 +178,7 @@ u8 rtw_hal_set_def_var(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, voi
 		return padapter->HalFunc.SetHalDefVarHandler(padapter,eVariable,pValue);
 	return _FAIL;
 }
+
 u8 rtw_hal_get_def_var(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, void * pValue)
 {
 	if(padapter->HalFunc.GetHalDefVarHandler)
@@ -189,6 +191,7 @@ void rtw_hal_set_odm_var(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, v
 	if(padapter->HalFunc.SetHalODMVarHandler)
 		padapter->HalFunc.SetHalODMVarHandler(padapter,eVariable,pValue1,bSet);
 }
+
 void	rtw_hal_get_odm_var(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, void * pValue1,bool bSet)
 {
 	if(padapter->HalFunc.GetHalODMVarHandler)
@@ -208,6 +211,7 @@ void rtw_hal_enable_interrupt(struct adapter *padapter)
 		DBG_871X("%s: HalFunc.enable_interrupt is NULL!\n", __FUNCTION__);
 
 }
+
 void rtw_hal_disable_interrupt(struct adapter *padapter)
 {
 	if (!is_primary_adapter(padapter)){
@@ -222,7 +226,6 @@ void rtw_hal_disable_interrupt(struct adapter *padapter)
 
 }
 
-
 u32	rtw_hal_inirp_init(struct adapter *padapter)
 {
 	u32 rst = _FAIL;
@@ -304,6 +307,7 @@ s32	rtw_hal_init_xmit_priv(struct adapter *padapter)
 		return padapter->HalFunc.init_xmit_priv(padapter);
 	return _FAIL;
 }
+
 void	rtw_hal_free_xmit_priv(struct adapter *padapter)
 {
 	if(padapter->HalFunc.free_xmit_priv != NULL)
@@ -317,6 +321,7 @@ s32	rtw_hal_init_recv_priv(struct adapter *padapter)
 
 	return _FAIL;
 }
+
 void	rtw_hal_free_recv_priv(struct adapter *padapter)
 {
 	if(padapter->HalFunc.free_recv_priv)
@@ -372,6 +377,7 @@ u32	rtw_hal_read_bbreg(struct adapter *padapter, u32 RegAddr, u32 BitMask)
 		 data = padapter->HalFunc.read_bbreg(padapter, RegAddr, BitMask);
 	return data;
 }
+
 void	rtw_hal_write_bbreg(struct adapter *padapter, u32 RegAddr, u32 BitMask, u32 Data)
 {
 	if(padapter->HalFunc.write_bbreg)
@@ -385,6 +391,7 @@ u32	rtw_hal_read_rfreg(struct adapter *padapter, u32 eRFPath, u32 RegAddr, u32 B
 		data = padapter->HalFunc.read_rfreg(padapter, eRFPath, RegAddr, BitMask);
 	return data;
 }
+
 void	rtw_hal_write_rfreg(struct adapter *padapter, u32 eRFPath, u32 RegAddr, u32 BitMask, u32 Data)
 {
 	if(padapter->HalFunc.write_rfreg)
@@ -422,13 +429,13 @@ void rtw_hal_bcn_related_reg_setting(struct adapter *padapter)
 		padapter->HalFunc.SetBeaconRelatedRegistersHandler(padapter);
 }
 
-
 u8	rtw_hal_antdiv_before_linked(struct adapter *padapter)
 {
 	if(padapter->HalFunc.AntDivBeforeLinkHandler)
 		return padapter->HalFunc.AntDivBeforeLinkHandler(padapter);
 	return false;
 }
+
 void	rtw_hal_antdiv_rssi_compared(struct adapter *padapter, struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src)
 {
 	if(padapter->HalFunc.AntDivCompareHandler)
@@ -444,7 +451,6 @@ s32	rtw_hal_hostap_mgnt_xmit_entry(struct adapter *padapter, _pkt *pkt)
 }
 #endif /* CONFIG_HOSTAPD_MLME */
 
-#ifdef DBG_CONFIG_ERROR_DETECT
 void	rtw_hal_sreset_init(struct adapter *padapter)
 {
 	if(padapter->HalFunc.sreset_init_value)
@@ -472,6 +478,7 @@ void rtw_hal_sreset_xmit_status_check(struct adapter *padapter)
 	if(padapter->HalFunc.sreset_xmit_status_check)
 		padapter->HalFunc.sreset_xmit_status_check(padapter);
 }
+
 void rtw_hal_sreset_linked_status_check(struct adapter *padapter)
 {
 	if (!is_primary_adapter(padapter))
@@ -480,6 +487,7 @@ void rtw_hal_sreset_linked_status_check(struct adapter *padapter)
 	if(padapter->HalFunc.sreset_linked_status_check)
 		padapter->HalFunc.sreset_linked_status_check(padapter);
 }
+
 u8   rtw_hal_sreset_get_wifi_status(struct adapter *padapter)
 {
 	u8 status = 0;
@@ -498,7 +506,6 @@ bool rtw_hal_sreset_inprogress(struct adapter *padapter)
 		inprogress = padapter->HalFunc.sreset_inprogress(padapter);
 	return inprogress;
 }
-#endif	/* DBG_CONFIG_ERROR_DETECT */
 
 int rtw_hal_iol_cmd(struct adapter *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt)
 {
diff --git a/hal/rtl8188e_hal_init.c b/hal/rtl8188e_hal_init.c
index 26f65d2..6d85a39 100755
--- a/hal/rtl8188e_hal_init.c
+++ b/hal/rtl8188e_hal_init.c
@@ -2666,8 +2666,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
 	pHalFunc->Efuse_PgPacketRead = &rtl8188e_Efuse_PgPacketRead;
 	pHalFunc->Efuse_PgPacketWrite = &rtl8188e_Efuse_PgPacketWrite;
 	pHalFunc->Efuse_WordEnableDataWrite = &rtl8188e_Efuse_WordEnableDataWrite;
-
-#ifdef DBG_CONFIG_ERROR_DETECT
 	pHalFunc->sreset_init_value = &sreset_init_value;
 	pHalFunc->sreset_reset_value = &sreset_reset_value;
 	pHalFunc->silentreset = &sreset_reset;
@@ -2675,7 +2673,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
 	pHalFunc->sreset_linked_status_check  = &rtl8188e_sreset_linked_status_check;
 	pHalFunc->sreset_get_wifi_status  = &sreset_get_wifi_status;
 	pHalFunc->sreset_inprogress= &sreset_inprogress;
-#endif /* DBG_CONFIG_ERROR_DETECT */
 
 	pHalFunc->GetHalODMVarHandler = &rtl8188e_GetHalODMVar;
 	pHalFunc->SetHalODMVarHandler = &rtl8188e_SetHalODMVar;
diff --git a/hal/rtl8188e_sreset.c b/hal/rtl8188e_sreset.c
index 3899236..db22032 100755
--- a/hal/rtl8188e_sreset.c
+++ b/hal/rtl8188e_sreset.c
@@ -22,8 +22,6 @@
 #include <rtl8188e_sreset.h>
 #include <rtl8188e_hal.h>
 
-#ifdef DBG_CONFIG_ERROR_DETECT
-
 void rtl8188e_sreset_xmit_status_check(struct adapter *padapter)
 {
 	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
@@ -38,9 +36,6 @@ void rtl8188e_sreset_xmit_status_check(struct adapter *padapter)
 		DBG_871X("%s REG_TXDMA_STATUS:0x%08x\n", __FUNCTION__, txdma_status);
 		rtw_hal_sreset_reset(padapter);
 	}
-	/* total xmit irp = 4 */
-	/* DBG_8192C("==>%s free_xmitbuf_cnt(%d),txirp_cnt(%d)\n",__FUNCTION__,pxmitpriv->free_xmitbuf_cnt,pxmitpriv->txirp_cnt); */
-	/* if(pxmitpriv->txirp_cnt == NR_XMITBUFF+1) */
 	current_time = rtw_get_current_time();
 
 	if(0 == pxmitpriv->free_xmitbuf_cnt || 0 == pxmitpriv->free_xmit_extbuf_cnt) {
@@ -56,7 +51,6 @@ void rtl8188e_sreset_xmit_status_check(struct adapter *padapter)
 				if (diff_time > 4000) {
 					u32 ability;
 
-					/* padapter->Wifi_Error_Status = WIFI_TX_HANG; */
 					rtw_hal_get_def_var(padapter, HAL_DEF_DBG_DM_FUNC, &ability);
 
 					DBG_871X("%s tx hang %s\n", __FUNCTION__,
@@ -101,4 +95,3 @@ void rtl8188e_sreset_linked_status_check(struct adapter *padapter)
 		return;
 	}
 }
-#endif
diff --git a/hal/usb_ops_linux.c b/hal/usb_ops_linux.c
index 3c3d8f7..f0765ad 100755
--- a/hal/usb_ops_linux.c
+++ b/hal/usb_ops_linux.c
@@ -98,12 +98,8 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u
 				{
 					padapter->bSurpriseRemoved = true;
 				} else {
-					#ifdef DBG_CONFIG_ERROR_DETECT
-					{
-						HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
-						pHalData->srestpriv.Wifi_Error_Status = USB_VEN_REQ_CMD_FAIL;
-					}
-					#endif
+					HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+					pHalData->srestpriv.Wifi_Error_Status = USB_VEN_REQ_CMD_FAIL;
 				}
 			}
 			else /*  status != len && status >= 0 */
@@ -304,7 +300,6 @@ static void interrupt_handler_8188eu(struct adapter *padapter,u16 pkt_len,u8 *pb
 	memcpy(&(pHalData->IntArray[0]), &(pbuf[USB_INTR_CONTENT_HISR_OFFSET]), 4);
 	memcpy(&(pHalData->IntArray[1]), &(pbuf[USB_INTR_CONTENT_HISRE_OFFSET]), 4);
 
-#ifdef DBG_CONFIG_ERROR_DETECT_INT
 	if (  pHalData->IntArray[1]  & IMR_TXERR_88E )
 		DBG_871X("===> %s Tx Error Flag Interrupt Status \n",__FUNCTION__);
 	if (  pHalData->IntArray[1]  & IMR_RXERR_88E )
@@ -313,7 +308,6 @@ static void interrupt_handler_8188eu(struct adapter *padapter,u16 pkt_len,u8 *pb
 		DBG_871X("===> %s Transmit FIFO Overflow \n",__FUNCTION__);
 	if (  pHalData->IntArray[1]  & IMR_RXFOVW_88E )
 		DBG_871X("===> %s Receive FIFO Overflow \n",__FUNCTION__);
-#endif/* DBG_CONFIG_ERROR_DETECT_INT */
 
 	/*  C2H Event */
 	if (pbuf[0]!= 0){
@@ -730,12 +724,10 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
 			case -ETIME:
 			case -ECOMM:
 			case -EOVERFLOW:
-				#ifdef DBG_CONFIG_ERROR_DETECT
 				{
 					HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
 					pHalData->srestpriv.Wifi_Error_Status = USB_READ_PORT_FAIL;
 				}
-				#endif
 				precvbuf->reuse = true;
 				rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf);
 				break;
diff --git a/include/autoconf.h b/include/autoconf.h
index bb65124..e018407 100755
--- a/include/autoconf.h
+++ b/include/autoconf.h
@@ -68,5 +68,4 @@
 
 #define CONFIG_PROC_DEBUG
 
-#define DBG_CONFIG_ERROR_DETECT
 #define DBG_CONFIG_ERROR_RESET
diff --git a/include/hal_intf.h b/include/hal_intf.h
index 7d1d47a..3131766 100755
--- a/include/hal_intf.h
+++ b/include/hal_intf.h
@@ -234,7 +234,6 @@ struct hal_ops {
 	u8	(*Efuse_WordEnableDataWrite)(struct adapter *padapter, u16 efuse_addr, u8 word_en, u8 *data, bool bPseudoTest);
 	bool	(*Efuse_PgPacketWrite_BT)(struct adapter *padapter, u8 offset, u8 word_en, u8 *data, bool bPseudoTest);
 
-#ifdef DBG_CONFIG_ERROR_DETECT
 	void (*sreset_init_value)(struct adapter *padapter);
 	void (*sreset_reset_value)(struct adapter *padapter);
 	void (*silentreset)(struct adapter *padapter);
@@ -242,7 +241,6 @@ struct hal_ops {
 	void (*sreset_linked_status_check) (struct adapter *padapter);
 	u8 (*sreset_get_wifi_status)(struct adapter *padapter);
 	bool (*sreset_inprogress)(struct adapter *padapter);
-#endif
 
 	int (*IOL_exec_cmds_sync)(struct adapter *padapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt);
 	void (*hal_notch_filter)(struct adapter * adapter, bool enable);
@@ -404,7 +402,6 @@ void	rtw_hal_antdiv_rssi_compared(struct adapter *padapter, struct wlan_bssid_ex
 s32	rtw_hal_hostap_mgnt_xmit_entry(struct adapter *padapter, _pkt *pkt);
 #endif
 
-#ifdef DBG_CONFIG_ERROR_DETECT
 void rtw_hal_sreset_init(struct adapter *padapter);
 void rtw_hal_sreset_reset(struct adapter *padapter);
 void rtw_hal_sreset_reset_value(struct adapter *padapter);
@@ -412,7 +409,6 @@ void rtw_hal_sreset_xmit_status_check(struct adapter *padapter);
 void rtw_hal_sreset_linked_status_check (struct adapter *padapter);
 u8   rtw_hal_sreset_get_wifi_status(struct adapter *padapter);
 bool rtw_hal_sreset_inprogress(struct adapter *padapter);
-#endif
 
 int rtw_hal_iol_cmd(struct adapter *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt);
 void rtw_hal_notch_filter(struct adapter * adapter, bool enable);
diff --git a/include/rtl8188e_hal.h b/include/rtl8188e_hal.h
index 61926e6..6e97061 100755
--- a/include/rtl8188e_hal.h
+++ b/include/rtl8188e_hal.h
@@ -31,9 +31,7 @@
 #include "rtl8188e_xmit.h"
 #include "rtl8188e_cmd.h"
 #include "Hal8188EPwrSeq.h"
-#ifdef DBG_CONFIG_ERROR_DETECT
 #include "rtl8188e_sreset.h"
-#endif
 #include "rtw_efuse.h"
 
 #include "../hal/odm_precomp.h"
@@ -414,9 +412,7 @@ typedef struct hal_data_8188e
 	struct dm_priv	dmpriv;
 	DM_ODM_T		odmpriv;
 	//_lock			odm_stainfo_lock;
-#ifdef DBG_CONFIG_ERROR_DETECT
 	struct sreset_priv srestpriv;
-#endif
 
 #ifdef CONFIG_BT_COEXIST
 	struct btcoexist_priv	bt_coexist;
diff --git a/include/rtl8188e_sreset.h b/include/rtl8188e_sreset.h
index e13d0bb..c97b1db 100755
--- a/include/rtl8188e_sreset.h
+++ b/include/rtl8188e_sreset.h
@@ -25,8 +25,7 @@
 #include <drv_types.h>
 #include <rtw_sreset.h>
 
-#ifdef DBG_CONFIG_ERROR_DETECT
-extern void rtl8188e_sreset_xmit_status_check(struct adapter *padapter);
-extern void rtl8188e_sreset_linked_status_check(struct adapter *padapter);
-#endif
+void rtl8188e_sreset_xmit_status_check(struct adapter *padapter);
+void rtl8188e_sreset_linked_status_check(struct adapter *padapter);
+
 #endif
diff --git a/include/rtl8192c_hal.h b/include/rtl8192c_hal.h
index b380512..086691d 100755
--- a/include/rtl8192c_hal.h
+++ b/include/rtl8192c_hal.h
@@ -28,10 +28,7 @@
 #include "rtl8192c_recv.h"
 #include "rtl8192c_xmit.h"
 #include "rtl8192c_cmd.h"
-
-#ifdef DBG_CONFIG_ERROR_DETECT
 #include "rtl8192c_sreset.h"
-#endif
 #include "rtw_efuse.h"
 
 #include "../hal/OUTSRC/odm_precomp.h"
@@ -443,10 +440,7 @@ struct hal_data_8192cu
 
 	struct dm_priv	dmpriv;
 	DM_ODM_T		odmpriv;
-	//_lock			odm_stainfo_lock;
-#ifdef DBG_CONFIG_ERROR_DETECT
 	struct sreset_priv srestpriv;
-#endif
 
 #ifdef CONFIG_BT_COEXIST
 	struct btcoexist_priv	bt_coexist;
diff --git a/include/rtl8192c_sreset.h b/include/rtl8192c_sreset.h
index 160cd1f..f98f5a6 100755
--- a/include/rtl8192c_sreset.h
+++ b/include/rtl8192c_sreset.h
@@ -25,8 +25,7 @@
 #include <drv_types.h>
 #include <rtw_sreset.h>
 
-#ifdef DBG_CONFIG_ERROR_DETECT
-extern void rtl8192c_sreset_xmit_status_check(struct adapter *padapter);
-extern void rtl8192c_sreset_linked_status_check(struct adapter *padapter);
-#endif
+void rtl8192c_sreset_xmit_status_check(struct adapter *padapter);
+void rtl8192c_sreset_linked_status_check(struct adapter *padapter);
+
 #endif
diff --git a/include/rtw_debug.h b/include/rtw_debug.h
index 1ac5a9a..5807f2a 100755
--- a/include/rtw_debug.h
+++ b/include/rtw_debug.h
@@ -437,16 +437,12 @@ extern u32 GlobalDebugLevel;
 
 #endif //CONFIG_BT_COEXIST
 
-#if defined(DBG_CONFIG_ERROR_DETECT)
 int proc_get_sreset(char *page, char **start, off_t offset, int count, int *eof, void *data);
 int proc_set_sreset(struct file *file, const char __user *buffer, unsigned long count, void *data);
-#endif /* DBG_CONFIG_ERROR_DETECT */
-
 int proc_get_odm_dbg_comp(char *page, char **start, off_t offset, int count, int *eof, void *data);
 int proc_set_odm_dbg_comp(struct file *file, const char __user *buffer, unsigned long count, void *data);
 int proc_get_odm_dbg_level(char *page, char **start, off_t offset, int count, int *eof, void *data);
 int proc_set_odm_dbg_level(struct file *file, const char __user *buffer, unsigned long count, void *data);
-
 int proc_get_odm_adaptivity(char *page, char **start, off_t offset, int count, int *eof, void *data);
 int proc_set_odm_adaptivity(struct file *file, const char __user *buffer, unsigned long count, void *data);
 
diff --git a/os_dep/ioctl_linux.c b/os_dep/ioctl_linux.c
index 2a1da5a..1fcc766 100755
--- a/os_dep/ioctl_linux.c
+++ b/os_dep/ioctl_linux.c
@@ -3016,16 +3016,12 @@ static void rtw_dbg_mode_hdl(struct adapter *padapter, u32 id, u8 *pdata, u32 le
 			rtw_hal_set_hwreg(padapter, HW_VAR_BT_ISSUE_DELBA, pdata);
 			break;
 #endif
-#ifdef DBG_CONFIG_ERROR_DETECT
 		case GEN_MP_IOCTL_SUBCODE(GET_WIFI_STATUS):
 			*pdata = rtw_hal_sreset_get_wifi_status(padapter);
 			break;
-#endif
-
 		default:
 			break;
 	}
-
 }
 
 static int rtw_mp_ioctl_hdl(struct net_device *dev, struct iw_request_info *info,
@@ -5990,7 +5986,6 @@ static int rtw_dbg_port(struct net_device *dev,
 						}
 					}
 					break;
-		#ifdef DBG_CONFIG_ERROR_DETECT
 				case 0x0f:
 						{
 							if(extra_arg == 0){
@@ -6010,18 +6005,13 @@ static int rtw_dbg_port(struct net_device *dev,
 						DBG_871X("==>silent resete cnts:%d\n",pwrpriv->ips_enter_cnts);
 					}
 					break;
-
-		#endif
-
 				case 0x10:/*  driver version display */
 					DBG_871X("rtw driver version=%s\n", DRIVERVERSION);
 					break;
 				case 0x11:
-					{
-						DBG_871X("turn %s Rx RSSI display function\n",(extra_arg==1)?"on":"off");
-						padapter->bRxRSSIDisplay = extra_arg;
-						rtw_hal_set_def_var(padapter, HW_DEF_FA_CNT_DUMP, &(padapter->bRxRSSIDisplay));
-					}
+					DBG_871X("turn %s Rx RSSI display function\n",(extra_arg==1)?"on":"off");
+					padapter->bRxRSSIDisplay = extra_arg;
+					rtw_hal_set_def_var(padapter, HW_DEF_FA_CNT_DUMP, &(padapter->bRxRSSIDisplay));
 					break;
 				case 0x12: /* set rx_stbc */
 				{
diff --git a/os_dep/os_intfs.c b/os_dep/os_intfs.c
index 809b2bc..e33bd3f 100755
--- a/os_dep/os_intfs.c
+++ b/os_dep/os_intfs.c
@@ -778,9 +778,7 @@ u8 rtw_reset_drv_sw(struct adapter *padapter)
 	#endif
 #endif
 
-#ifdef DBG_CONFIG_ERROR_DETECT
 	rtw_hal_sreset_reset_value(padapter);
-#endif
 	pwrctrlpriv->pwr_state_check_cnts = 0;
 
 	/* mlmeextpriv */
@@ -882,9 +880,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter)
 	rtw_hal_dm_init(padapter);
 	rtw_hal_sw_led_init(padapter);
 
-#ifdef DBG_CONFIG_ERROR_DETECT
 	rtw_hal_sreset_init(padapter);
-#endif
 
 #ifdef CONFIG_BR_EXT
 	spin_lock_init(&padapter->br_ext_lock);
diff --git a/os_dep/usb_ops_linux.c b/os_dep/usb_ops_linux.c
index 921c398..39564a4 100755
--- a/os_dep/usb_ops_linux.c
+++ b/os_dep/usb_ops_linux.c
@@ -390,13 +390,10 @@ static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs)
 		}
 	}
 
-	#ifdef DBG_CONFIG_ERROR_DETECT
 	{
 		HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
 		pHalData->srestpriv.last_tx_complete_time = rtw_get_current_time();
 	}
-	#endif
-
 check_completion:
 	_enter_critical(&pxmitpriv->lock_sctx, &irqL);
 	rtw_sctx_done_err(&pxmitbuf->sctx,
@@ -543,12 +540,8 @@ u32 usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem)
 
 	status = usb_submit_urb(purb, GFP_ATOMIC);
 	if (!status) {
-		#ifdef DBG_CONFIG_ERROR_DETECT
-		{
-			HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
-			pHalData->srestpriv.last_tx_time = rtw_get_current_time();
-		}
-		#endif
+		HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+		pHalData->srestpriv.last_tx_time = rtw_get_current_time();
 	} else {
 		rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_WRITE_PORT_ERR);
 		DBG_871X("usb_write_port, status=%d\n", status);