diff --git a/core/rtw_ap.c b/core/rtw_ap.c
index 67a3b03..2db73f6 100755
--- a/core/rtw_ap.c
+++ b/core/rtw_ap.c
@@ -2085,17 +2085,7 @@ u8 ap_free_sta(struct adapter *padapter, struct sta_info *psta, bool active, u16
 	psta->state &= ~_FW_LINKED;
 	_exit_critical_bh(&psta->lock, &irqL);
 
-	if (1) {
-		#ifdef COMPAT_KERNEL_RELEASE
-		rtw_cfg80211_indicate_sta_disassoc(padapter, psta->hwaddr, reason);
-		#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) && !defined(CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER)
-		rtw_cfg80211_indicate_sta_disassoc(padapter, psta->hwaddr, reason);
-		#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) && !defined(CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER) */
-		/* will call rtw_cfg80211_indicate_sta_disassoc() in cmd_thread for old API context */
-		#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) && !defined(CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER) */
-	} else {
-		rtw_indicate_sta_disassoc_event(padapter, psta);
-	}
+	rtw_cfg80211_indicate_sta_disassoc(padapter, psta->hwaddr, reason);
 
 	report_del_sta_event(padapter, psta->hwaddr, reason);
 
@@ -2105,9 +2095,7 @@ u8 ap_free_sta(struct adapter *padapter, struct sta_info *psta, bool active, u16
 	rtw_free_stainfo(padapter, psta);
 	_exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL);
 
-
 	return beacon_updated;
-
 }
 
 int rtw_ap_inform_ch_switch(struct adapter *padapter, u8 new_ch, u8 ch_offset)
diff --git a/core/rtw_mlme.c b/core/rtw_mlme.c
index ab05ca2..f5f85ec 100755
--- a/core/rtw_mlme.c
+++ b/core/rtw_mlme.c
@@ -2072,11 +2072,7 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)
 
         if(check_fwstate(pmlmepriv, WIFI_AP_STATE))
         {
-		#ifdef COMPAT_KERNEL_RELEASE
-
-		#elif (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)) || defined(CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER)
 		rtw_cfg80211_indicate_sta_disassoc(adapter, pstadel->macaddr, *(u16*)pstadel->rsvd);
-		#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)) || defined(CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER) */
 		return;
         }
 
diff --git a/include/autoconf.h b/include/autoconf.h
index 4168af4..851b84d 100755
--- a/include/autoconf.h
+++ b/include/autoconf.h
@@ -36,7 +36,6 @@
 
 #define CONFIG_RTL8188E
 
-#define CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER
 #define CONFIG_SET_SCAN_DENY_TIMER
 
 /*