From fdf5acc152c853adb0e8dabbee8a9976f4601c15 Mon Sep 17 00:00:00 2001 From: Kamil Lorenc Date: Sun, 26 May 2019 16:21:44 +0200 Subject: [PATCH] Replace get_ds with KERNEL_DS get_ds was removed from kernel in version 5.1.0, because it always expanded to KERNEL_DS. It is safe to replace it with KERNEL_DS from at least version 2.6.11 --- os_dep/osdep_service.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c index 88a3ff5..0bfb93a 100644 --- a/os_dep/osdep_service.c +++ b/os_dep/osdep_service.c @@ -1961,7 +1961,7 @@ static int isFileReadable(char *path) ret = PTR_ERR(fp); else { oldfs = get_fs(); - set_fs(get_ds()); + set_fs(KERNEL_DS); if (1 != readFile(fp, &buf, 1)) ret = PTR_ERR(fp); @@ -1991,7 +1991,7 @@ static int retriveFromFile(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()); + set_fs(KERNEL_DS); ret = readFile(fp, buf, sz); set_fs(oldfs); closeFile(fp); @@ -2026,7 +2026,7 @@ static int storeToFile(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()); + set_fs(KERNEL_DS); ret = writeFile(fp, buf, sz); set_fs(oldfs); closeFile(fp);