From 318fbbb756a317c0ee0cd68fd81e1501474b8a8f Mon Sep 17 00:00:00 2001 From: Rin Cat Date: Sat, 21 Sep 2019 05:42:27 -0400 Subject: [PATCH] Linux 5.1 compat: get_ds() --- os_dep/osdep_service.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c index 83c7640..c549e64 100644 --- a/os_dep/osdep_service.c +++ b/os_dep/osdep_service.c @@ -2201,7 +2201,11 @@ static int isFileReadable(const char *path, u32 *sz) ret = PTR_ERR(fp); else { oldfs = get_fs(); - set_fs(get_ds()); + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)) + set_fs(KERNEL_DS); + #else + set_fs(get_ds()); + #endif if (1 != readFile(fp, &buf, 1)) ret = PTR_ERR(fp); @@ -2239,7 +2243,11 @@ static int retriveFromFile(const char *path, u8 *buf, u32 sz) RTW_INFO("%s openFile path:%s fp=%p\n", __FUNCTION__, path , fp); oldfs = get_fs(); - set_fs(get_ds()); + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)) + set_fs(KERNEL_DS); + #else + set_fs(get_ds()); + #endif ret = readFile(fp, buf, sz); set_fs(oldfs); closeFile(fp); @@ -2274,7 +2282,11 @@ static int storeToFile(const char *path, u8 *buf, u32 sz) RTW_INFO("%s openFile path:%s fp=%p\n", __FUNCTION__, path , fp); oldfs = get_fs(); - set_fs(get_ds()); + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)) + set_fs(KERNEL_DS); + #else + set_fs(get_ds()); + #endif ret = writeFile(fp, buf, sz); set_fs(oldfs); closeFile(fp);