From 4132c6bf8d5ef5a66ec9f166fc38a1e0ee1cc0f9 Mon Sep 17 00:00:00 2001 From: 5kft <5kft@users.noreply.github.com> Date: Mon, 10 Jul 2023 20:34:42 -0700 Subject: [PATCH 1/3] update for kernel v6.5 (tdls_mgmt) --- os_dep/linux/ioctl_cfg80211.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c index 20aa25b..5bcceff 100644 --- a/os_dep/linux/ioctl_cfg80211.c +++ b/os_dep/linux/ioctl_cfg80211.c @@ -8507,6 +8507,9 @@ static int cfg80211_rtw_tdls_mgmt(struct wiphy *wiphy, const u8 *peer, #else u8 *peer, +#endif +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 5, 0)) + int link_id, #endif u8 action_code, u8 dialog_token, From d6a07317b4c0b40eb67a148058a23c9fe1c38d0b Mon Sep 17 00:00:00 2001 From: Steve Jeong Date: Tue, 18 Jul 2023 16:19:45 +0900 Subject: [PATCH 2/3] fix: os_dep/osdep_service.c: add VFS namespace Error in Rockchip v20230524 kernel 5.10.y ERROR: modpost: module 8821cu uses symbol kernel_write from namespace VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver, but does not import it. ERROR: modpost: module 8821cu uses symbol kernel_read from namespace VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver, but does not import it. ERROR: modpost: module 8821cu uses symbol filp_open from namespace VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver, but does not import it. make[1]: *** [scripts/Makefile.modpost:168: modules-only.symvers] Error 1 make[1]: *** Deleting file 'modules-only.symvers' make: *** [Makefile:1524: modules] Error 2 make: *** Waiting for unfinished jobs.... Signed-off-by: Steve Jeong --- os_dep/osdep_service.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c index 31d8670..d772767 100644 --- a/os_dep/osdep_service.c +++ b/os_dep/osdep_service.c @@ -2428,6 +2428,7 @@ static int readFile(struct file *fp, char *buf, int len) while (sum < len) { #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)) + MODULE_IMPORT_NS(VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver); rlen = kernel_read(fp, buf + sum, len - sum, &fp->f_pos); #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)) rlen = __vfs_read(fp, buf + sum, len - sum, &fp->f_pos); @@ -2459,6 +2460,7 @@ static int writeFile(struct file *fp, char *buf, int len) while (sum < len) { #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)) + MODULE_IMPORT_NS(VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver); wlen = kernel_write(fp, buf + sum, len - sum, &fp->f_pos); #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)) wlen = __vfs_write(fp, buf + sum, len - sum, &fp->f_pos); From 1644c2d5762a526b5441e3dc1b307ba1ef8e17fd Mon Sep 17 00:00:00 2001 From: Steve Jeong Date: Wed, 19 Jul 2023 10:28:58 +0900 Subject: [PATCH 3/3] os_dep/osdep_service.c: improve code Signed-off-by: Steve Jeong --- os_dep/osdep_service.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c index d772767..7733464 100644 --- a/os_dep/osdep_service.c +++ b/os_dep/osdep_service.c @@ -2428,7 +2428,6 @@ static int readFile(struct file *fp, char *buf, int len) while (sum < len) { #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)) - MODULE_IMPORT_NS(VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver); rlen = kernel_read(fp, buf + sum, len - sum, &fp->f_pos); #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)) rlen = __vfs_read(fp, buf + sum, len - sum, &fp->f_pos); @@ -2460,7 +2459,6 @@ static int writeFile(struct file *fp, char *buf, int len) while (sum < len) { #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)) - MODULE_IMPORT_NS(VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver); wlen = kernel_write(fp, buf + sum, len - sum, &fp->f_pos); #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)) wlen = __vfs_write(fp, buf + sum, len - sum, &fp->f_pos); @@ -3535,3 +3533,4 @@ int hwaddr_aton_i(const char *txt, u8 *addr) return 0; } +MODULE_IMPORT_NS(VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver);