From f6d4598290c5e9c8e545130e8a31d130f6d135f4 Mon Sep 17 00:00:00 2001 From: morrownr Date: Sun, 10 Sep 2023 15:39:08 -0500 Subject: [PATCH] fix (again) the -am_NOT_a_driver problem- --- os_dep/linux/os_intfs.c | 9 +++++++++ os_dep/osdep_service.c | 10 ---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c index 2c07635..26bb2f8 100644 --- a/os_dep/linux/os_intfs.c +++ b/os_dep/linux/os_intfs.c @@ -21,6 +21,15 @@ MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Realtek Wireless Lan Driver"); MODULE_AUTHOR("Realtek Semiconductor Corp."); MODULE_VERSION(DRIVERVERSION); +/* Include namespace when file system namespace errors occur during + * kernel build. This is about 'kernel_read' or 'kernel_write' + * + * This declaration was created to resolve an error on Rockchip. + * You can modify or add flags in the fs/Makefile. + */ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0) + MODULE_IMPORT_NS(VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver); +#endif /* module param defaults */ int rtw_chip_version = 0x00; diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c index 0413f0a..fc56358 100644 --- a/os_dep/osdep_service.c +++ b/os_dep/osdep_service.c @@ -52,16 +52,6 @@ inline int RTW_STATUS_CODE(int error_code) } #endif -/* Include namespace when file system namespace errors occur during kernel build. - * about 'kernel_read' or 'kernel_write' - * - * This declaration was created to resolve an error on the Rockchip side - * You can modify or add flags in the fs/Makefile. - */ -#ifdef ANDROID_GKI_VFS_EXPORT_ONLY - MODULE_IMPORT_NS(VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver); -#endif - u32 rtw_atoi(u8 *s) {