From 392109f98a85c8f7964f9de99fe0e12cc92e3159 Mon Sep 17 00:00:00 2001
From: kimocoder <christian@aircrack-ng.org>
Date: Tue, 17 Dec 2019 19:29:57 +0100
Subject: [PATCH] Test fix for latest kernel which changed 'asm' to
 'asm_inline'

---
 core/rtw_debug.c              | 5 +++++
 include/byteorder/generic.h   | 5 +++++
 include/osdep_service_linux.h | 5 +++++
 os_dep/linux/ioctl_mp.c       | 5 +++++
 os_dep/linux/rtw_cfgvendor.c  | 5 +++++
 os_dep/osdep_service.c        | 5 +++++
 6 files changed, 30 insertions(+)

diff --git a/core/rtw_debug.c b/core/rtw_debug.c
index 22ff44f..aae53b9 100644
--- a/core/rtw_debug.c
+++ b/core/rtw_debug.c
@@ -17,6 +17,11 @@
 #include <drv_types.h>
 #include <hal_data.h>
 
+#ifdef asm_inline
+#undef asm_inline
+#define asm_inline asm
+#endif
+
 #ifdef CONFIG_RTW_DEBUG
 const char *rtw_log_level_str[] = {
 	"_DRV_NONE_ = 0",
diff --git a/include/byteorder/generic.h b/include/byteorder/generic.h
index f85114b..9286cd7 100644
--- a/include/byteorder/generic.h
+++ b/include/byteorder/generic.h
@@ -15,6 +15,11 @@
 #ifndef _LINUX_BYTEORDER_GENERIC_H
 #define _LINUX_BYTEORDER_GENERIC_H
 
+#ifdef asm_inline
+#undef asm_inline
+#define asm_inline asm
+#endif
+
 /*
  * linux/byteorder_generic.h
  * Generic Byte-reordering support
diff --git a/include/osdep_service_linux.h b/include/osdep_service_linux.h
index 2f84f97..7f442a2 100644
--- a/include/osdep_service_linux.h
+++ b/include/osdep_service_linux.h
@@ -15,6 +15,11 @@
 #ifndef __OSDEP_LINUX_SERVICE_H_
 #define __OSDEP_LINUX_SERVICE_H_
 
+#ifdef asm_inline
+#undef asm_inline
+#define asm_inline asm
+#endif
+
 #include <linux/version.h>
 #include <linux/spinlock.h>
 #include <linux/compiler.h>
diff --git a/os_dep/linux/ioctl_mp.c b/os_dep/linux/ioctl_mp.c
index a459afb..873408e 100644
--- a/os_dep/linux/ioctl_mp.c
+++ b/os_dep/linux/ioctl_mp.c
@@ -14,6 +14,11 @@
  *****************************************************************************/
 #if defined(CONFIG_MP_INCLUDED)
 
+#ifdef asm_inline
+#undef asm_inline
+#define asm_inline asm
+#endif
+
 #ifdef MARK_KERNEL_PFU
 	#include <linux/kernel.h>
 	#include <asm/fpu/api.h>
diff --git a/os_dep/linux/rtw_cfgvendor.c b/os_dep/linux/rtw_cfgvendor.c
index d906163..c20cd42 100644
--- a/os_dep/linux/rtw_cfgvendor.c
+++ b/os_dep/linux/rtw_cfgvendor.c
@@ -15,6 +15,11 @@
 
 #include <drv_types.h>
 
+#ifdef asm_inline
+#undef asm_inline
+#define asm_inline asm
+#endif
+
 #ifdef CONFIG_IOCTL_CFG80211
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) || defined(RTW_VENDOR_EXT_SUPPORT)
diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c
index 7c6d120..c51d03a 100644
--- a/os_dep/osdep_service.c
+++ b/os_dep/osdep_service.c
@@ -13,6 +13,11 @@
  *
  *****************************************************************************/
 
+#ifdef asm_inline
+#undef asm_inline
+#define asm_inline asm
+#endif
+
 #define _OSDEP_SERVICE_C_
 
 #include <drv_types.h>