diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c
index 0c7273b..c8b63ae 100644
--- a/core/rtw_mlme_ext.c
+++ b/core/rtw_mlme_ext.c
@@ -1832,11 +1832,11 @@ void mgt_dispatcher(_adapter *padapter, union recv_frame *precv_frame)
 		else
 			ptable->func = &OnAuthClient;
 		_mgt_dispatcher(padapter, ptable, precv_frame);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)
-	__attribute__ ((fallthrough));
-#else
-			__attribute__ ((__fallthrough__));
-#endif
+//#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)
+//	__attribute__ ((fallthrough));
+//#else
+//			__attribute__ ((fallthrough));
+//#endif
         break;
 	case WIFI_ASSOCREQ:
 	case WIFI_REASSOCREQ:
diff --git a/core/rtw_security.c b/core/rtw_security.c
index 926e0ea..1e535a1 100644
--- a/core/rtw_security.c
+++ b/core/rtw_security.c
@@ -1575,7 +1575,7 @@ u32	rtw_aes_encrypt(_adapter *padapter, u8 *pxmitframe)
 	pframe = ((struct xmit_frame *)pxmitframe)->buf_addr + hw_hdr_offset;
 
 	/* 4 start to encrypt each fragment */
-	if ((pattrib->encrypt == _AES_)) {
+	if (pattrib->encrypt == _AES_) {
 		/*
 				if(pattrib->psta)
 				{
@@ -1930,7 +1930,7 @@ u32	rtw_aes_decrypt(_adapter *padapter, u8 *precvframe)
 	u32	res = _SUCCESS;
 	pframe = (unsigned char *)((union recv_frame *)precvframe)->u.hdr.rx_data;
 	/* 4 start to encrypt each fragment */
-	if ((prxattrib->encrypt == _AES_)) {
+	if (prxattrib->encrypt == _AES_) {
 
 		stainfo = rtw_get_stainfo(&padapter->stapriv , &prxattrib->ta[0]);
 		if (stainfo != NULL) {
diff --git a/hal/phydm/halrf/halrf_features.h b/hal/phydm/halrf/halrf_features.h
index c6ef3e6..b8379c0 100644
--- a/hal/phydm/halrf/halrf_features.h
+++ b/hal/phydm/halrf/halrf_features.h
@@ -24,7 +24,7 @@
  *****************************************************************************/
 
 #ifndef	__HALRF_FEATURES_H__
-#define __HALRF_FEATURES
+#define __HALRF_FEATURES_H__
 
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
 
diff --git a/hal/phydm/halrf/halrf_kfree.h b/hal/phydm/halrf/halrf_kfree.h
index a5159d1..cefae07 100644
--- a/hal/phydm/halrf/halrf_kfree.h
+++ b/hal/phydm/halrf/halrf_kfree.h
@@ -25,7 +25,7 @@
 
 
 #ifndef	__PHYDMKFREE_H__
-#define    __PHYDKFREE_H__
+#define    __PHYDMKFREE_H__
 
 #define KFREE_VERSION	"1.0"
 
diff --git a/hal/phydm/phydm_phystatus.c b/hal/phydm/phydm_phystatus.c
index b87a144..f7addfb 100644
--- a/hal/phydm/phydm_phystatus.c
+++ b/hal/phydm/phydm_phystatus.c
@@ -52,12 +52,10 @@ phydm_rx_statistic_cal(
 		phydm->phy_dbg_info.ht_pkt_not_zero = true;
 
 		if (phydm->support_ic_type & PHYSTS_2ND_TYPE_IC) {
-			if ((bw_idx == *phydm->band_width)) {
-				
+			if (bw_idx == *phydm->band_width) {
 				phydm->phy_dbg_info.num_qry_ht_pkt[date_rate - ODM_RATEMCS0]++;
 
 			} else if (bw_idx == CHANNEL_WIDTH_20) {
-			
 				phydm->phy_dbg_info.num_qry_pkt_sc_20m[date_rate - ODM_RATEMCS0]++;
 				phydm->phy_dbg_info.low_bw_20_occur = true;
 			}
@@ -68,9 +66,9 @@ phydm_rx_statistic_cal(
 	#if ODM_IC_11AC_SERIES_SUPPORT
 	else if (date_rate <= ODM_RATEVHTSS4MCS9) {
 		#if (ODM_PHY_STATUS_NEW_TYPE_SUPPORT == 1)
-		if ((phy_status_type == 1) && 
-			(phy_sta_rpt->gid != 0) && 
-			(phy_sta_rpt->gid != 63) && 
+		if ((phy_status_type == 1) &&
+			(phy_sta_rpt->gid != 0) &&
+			(phy_sta_rpt->gid != 63) &&
 			(phydm->support_ic_type & PHYSTS_2ND_TYPE_IC)) {
 			phydm->phy_dbg_info.num_qry_mu_vht_pkt[date_rate - ODM_RATEVHTSS1MCS0]++;
 			if (pktinfo->ppdu_cnt < 4) {
@@ -81,7 +79,6 @@ phydm_rx_statistic_cal(
 		#endif
 		{
 			phydm->phy_dbg_info.vht_pkt_not_zero = true;
-			
 			if (phydm->support_ic_type & PHYSTS_2ND_TYPE_IC) {
 				if ((bw_idx == *phydm->band_width)) {
 					phydm->phy_dbg_info.num_qry_vht_pkt[date_rate - ODM_RATEVHTSS1MCS0]++;