diff -U 3 -H -d -r -N -- a/core/efuse/rtw_efuse.c b/core/efuse/rtw_efuse.c
--- a/core/efuse/rtw_efuse.c	2020-12-02 18:44:07.000000000 +0100
+++ b/core/efuse/rtw_efuse.c	2021-10-09 17:19:38.136590369 +0200
@@ -902,13 +902,14 @@
 	j = 0;
 
 	for (i = 0; i < mapLen; i++) {
-		if (i % 16 == 0)
+		if (i % 16 == 0) {
 			RTW_PRINT_SEL(RTW_DBGDUMP, "0x%03x: ", i);
 			_RTW_PRINT_SEL(RTW_DBGDUMP, "%02X%s"
 				, pEfuseHal->fakeEfuseInitMap[i]
 				, ((i + 1) % 16 == 0) ? "\n" : (((i + 1) % 8 == 0) ? "	  " : " ")
 			);
 		}
+    }
 	_RTW_PRINT_SEL(RTW_DBGDUMP, "\n");
 
 out_free_buffer:
diff -U 3 -H -d -r -N -- a/core/rtw_br_ext.c b/core/rtw_br_ext.c
--- a/core/rtw_br_ext.c	2020-12-02 18:44:07.000000000 +0100
+++ b/core/rtw_br_ext.c	2021-10-09 17:16:51.324280198 +0200
@@ -15,9 +15,12 @@
 #define _RTW_BR_EXT_C_
 
 #ifdef __KERNEL__
+    #include <linux/version.h>
 	#include <linux/if_arp.h>
 	#include <net/ip.h>
+	#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0))
 	#include <net/ipx.h>
+    #endif
 	#include <linux/atalk.h>
 	#include <linux/udp.h>
 	#include <linux/if_pppox.h>
@@ -889,6 +892,7 @@
 		}
 	}
 
+	#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0))
 	/*---------------------------------------------------*/
 	/*         Handle IPX and Apple Talk frame          */
 	/*---------------------------------------------------*/
@@ -1109,7 +1113,8 @@
 
 		return -1;
 	}
-
+    #endif
+    
 	/*---------------------------------------------------*/
 	/*                Handle PPPoE frame                */
 	/*---------------------------------------------------*/
diff -U 3 -H -d -r -N -- a/core/rtw_mlme.c b/core/rtw_mlme.c
--- a/core/rtw_mlme.c	2020-12-02 18:44:07.000000000 +0100
+++ b/core/rtw_mlme.c	2021-10-09 17:41:25.891636938 +0200
@@ -3127,10 +3127,14 @@
 		#ifdef CONFIG_LAYER2_ROAMING
 		if (rtw_chk_roam_flags(padapter, RTW_ROAM_ACTIVE) && pmlmepriv->need_to_roam == _TRUE)
 			RTW_INFO(FUNC_ADPT_FMT" need to roam, don't care BusyTraffic\n", FUNC_ADPT_ARG(padapter));
-		else
-		#endif
+		else {
+            RTW_INFO(FUNC_ADPT_FMT" exit BusyTraffic\n", FUNC_ADPT_ARG(padapter));
+			goto exit;
+		}
+		#else
 			RTW_INFO(FUNC_ADPT_FMT" exit BusyTraffic\n", FUNC_ADPT_ARG(padapter));
 			goto exit;
+        #endif
 	}
 	else if (ssc_chk != SS_ALLOW)
 		goto exit;