diff --git a/core/rtw_mp.c b/core/rtw_mp.c
index 951b76e..7a42db4 100644
--- a/core/rtw_mp.c
+++ b/core/rtw_mp.c
@@ -1356,7 +1356,6 @@ exit:
 	pmptx->stop = 1;
 
 	thread_exit(NULL);
-	return 0;
 }
 
 void fill_txdesc_for_mp(PADAPTER padapter, u8 *ptxdesc)
diff --git a/include/osdep_service.h b/include/osdep_service.h
index ae08c06..3036b69 100644
--- a/include/osdep_service.h
+++ b/include/osdep_service.h
@@ -315,7 +315,7 @@ static __inline void thread_enter(char *name)
 	allow_signal(SIGTERM);
 #endif
 }
-void thread_exit(_completion *comp);
+__noreturn void thread_exit(_completion *comp);
 void _rtw_init_completion(_completion *comp);
 void _rtw_wait_for_comp_timeout(_completion *comp);
 void _rtw_wait_for_comp(_completion *comp);
diff --git a/os_dep/linux/ioctl_linux.c b/os_dep/linux/ioctl_linux.c
index cb1bba6..6103850 100644
--- a/os_dep/linux/ioctl_linux.c
+++ b/os_dep/linux/ioctl_linux.c
@@ -14,6 +14,8 @@
  *****************************************************************************/
 #define _IOCTL_LINUX_C_
 
+
+#include <net/mac80211.h>
 #include <drv_types.h>
 #include <rtw_mp.h>
 #include <rtw_mp_ioctl.h>
@@ -22,6 +24,12 @@
 #include "../../hal/hal_halmac.h"
 #endif
 
+#ifdef __KERNEL__
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(7, 0, 0))
+extern int mac_pton(const char *s, u8 *addr);
+#endif
+#endif
+
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27))
 #define  iwe_stream_add_event(a, b, c, d, e)  iwe_stream_add_event(b, c, d, e)
 #define  iwe_stream_add_point(a, b, c, d, e)  iwe_stream_add_point(b, c, d, e)
diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c
index e6954c3..833f823 100644
--- a/os_dep/osdep_service.c
+++ b/os_dep/osdep_service.c
@@ -872,7 +872,7 @@ u32 _rtw_down_sema(_sema *sema)
 
 }
 
-inline void thread_exit(_completion *comp)
+__noreturn inline void thread_exit(_completion *comp)
 {
 #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
 	complete_and_exit(comp, 0);