diff --git a/core/rtw_cmd.c b/core/rtw_cmd.c
index db919ba..9e46906 100644
--- a/core/rtw_cmd.c
+++ b/core/rtw_cmd.c
@@ -82,9 +82,8 @@ _func_exit_;
 
 }
 
-#ifdef CONFIG_C2H_WK
 static void c2h_wk_callback(_workitem *work);
-#endif
+
 sint _rtw_init_evt_priv(struct evt_priv *pevtpriv)
 {
 	sint res=_SUCCESS;
@@ -95,11 +94,9 @@ _func_enter_;
 	ATOMIC_SET(&pevtpriv->event_seq, 0);
 	pevtpriv->evt_done_cnt = 0;
 
-#ifdef CONFIG_C2H_WK
 	_init_workitem(&pevtpriv->c2h_wk, c2h_wk_callback, NULL);
 	pevtpriv->c2h_wk_alive = false;
 	pevtpriv->c2h_queue = rtw_cbuf_alloc(C2H_QUEUE_MAX_LEN+1);
-#endif
 
 _func_exit_;
 
@@ -112,7 +109,6 @@ _func_enter_;
 
 	RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,("+_rtw_free_evt_priv\n"));
 
-#ifdef CONFIG_C2H_WK
 	_cancel_workitem_sync(&pevtpriv->c2h_wk);
 	while (pevtpriv->c2h_wk_alive)
 		rtw_msleep_os(10);
@@ -124,8 +120,6 @@ _func_enter_;
 			rtw_mfree(c2h, 16);
 		}
 	}
-#endif
-
 	RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,("-_rtw_free_evt_priv\n"));
 
 _func_exit_;
@@ -2265,7 +2259,6 @@ exit:
 	return ret;
 }
 
-#ifdef CONFIG_C2H_WK
 static void c2h_wk_callback(_workitem *work)
 {
 	struct evt_priv *evtpriv = container_of(work, struct evt_priv, c2h_wk);
@@ -2306,7 +2299,6 @@ static void c2h_wk_callback(_workitem *work)
 
 	evtpriv->c2h_wk_alive = false;
 }
-#endif
 
 u8 rtw_drvextra_cmd_hdl(_adapter *padapter, unsigned char *pbuf)
 {
diff --git a/include/rtw_cmd.h b/include/rtw_cmd.h
index fa0397d..d46426e 100644
--- a/include/rtw_cmd.h
+++ b/include/rtw_cmd.h
@@ -69,13 +69,10 @@ struct cmd_priv {
 };
 
 struct	evt_priv {
-#define CONFIG_C2H_WK
-#ifdef CONFIG_C2H_WK
 	_workitem c2h_wk;
 	bool c2h_wk_alive;
 	struct rtw_cbuf *c2h_queue;
 	#define C2H_QUEUE_MAX_LEN 10
-#endif
 	ATOMIC_T event_seq;
 	u8	*evt_buf;	//shall be non-paged, and 4 bytes aligned
 	u8	*evt_allocated_buf;