From 6435038754ab7fafcd017fe337db1b9181892306 Mon Sep 17 00:00:00 2001 From: Ecos-hj Date: Mon, 4 Jan 2021 20:59:42 +0100 Subject: [PATCH] Kernel 5.10.X Support --- os_dep/osdep_service.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c index e63eaac..4f791b6 100644 --- a/os_dep/osdep_service.c +++ b/os_dep/osdep_service.c @@ -2084,8 +2084,10 @@ static int isFileReadable(const char *path, u32 *sz) if (IS_ERR(fp)) ret = PTR_ERR(fp); else { + #if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)) oldfs = get_fs(); set_fs(KERNEL_DS); + #endif if (1 != readFile(fp, &buf, 1)) ret = PTR_ERR(fp); @@ -2097,8 +2099,9 @@ static int isFileReadable(const char *path, u32 *sz) *sz = i_size_read(fp->f_dentry->d_inode); #endif } - + #if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)) set_fs(oldfs); + #endif filp_close(fp, NULL); } return ret; @@ -2121,11 +2124,14 @@ static int retriveFromFile(const char *path, u8 *buf, u32 sz) ret = openFile(&fp, path, O_RDONLY, 0); if (0 == ret) { RTW_INFO("%s openFile path:%s fp=%p\n", __FUNCTION__, path , fp); - + #if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)) oldfs = get_fs(); set_fs(KERNEL_DS); + #endif ret = readFile(fp, buf, sz); + #if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)) set_fs(oldfs); + #endif closeFile(fp); RTW_INFO("%s readFile, ret:%d\n", __FUNCTION__, ret); @@ -2156,11 +2162,14 @@ static int storeToFile(const char *path, u8 *buf, u32 sz) ret = openFile(&fp, path, O_CREAT | O_WRONLY, 0666); if (0 == ret) { RTW_INFO("%s openFile path:%s fp=%p\n", __FUNCTION__, path , fp); - + #if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)) oldfs = get_fs(); set_fs(KERNEL_DS); + #endif ret = writeFile(fp, buf, sz); + #if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)) set_fs(oldfs); + #endif closeFile(fp); RTW_INFO("%s writeFile, ret:%d\n", __FUNCTION__, ret);