From b8841b9c87aa0f56272aa0bafdaa47f3ab776cc4 Mon Sep 17 00:00:00 2001 From: Oleg Date: Sat, 30 Apr 2022 19:48:12 +0300 Subject: [PATCH] fix build for kernel 5.17 (#3729) --- lib/compilation-prepare.sh | 3 - patch/misc/wireless-rtl8822bs.patch | 88 ----------------------------- 2 files changed, 91 deletions(-) delete mode 100644 patch/misc/wireless-rtl8822bs.patch diff --git a/lib/compilation-prepare.sh b/lib/compilation-prepare.sh index 25449ed8f0..c1dd88b3f6 100644 --- a/lib/compilation-prepare.sh +++ b/lib/compilation-prepare.sh @@ -705,9 +705,6 @@ compilation_prepare() sed -i '/source "drivers\/net\/wireless\/ti\/Kconfig"/a source "drivers\/net\/wireless\/rtl8822bs\/Kconfig"' \ $kerneldir/drivers/net/wireless/Kconfig - # add support for K5.11+ - process_patch_file "${SRC}/patch/misc/wireless-rtl8822bs.patch" "applying" - fi diff --git a/patch/misc/wireless-rtl8822bs.patch b/patch/misc/wireless-rtl8822bs.patch deleted file mode 100644 index 1a58352214..0000000000 --- a/patch/misc/wireless-rtl8822bs.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 321ba9cbeefcb10522d65fd02848f313d6b2f771 Mon Sep 17 00:00:00 2001 -From: Igor Pecovnik -Date: Wed, 16 Mar 2022 01:08:57 +0100 -Subject: [PATCH] kdsd - -Signed-off-by: Igor Pecovnik ---- - .../wireless/rtl8822bs/os_dep/osdep_service.c | 21 ++++++++++++++----- - 1 file changed, 16 insertions(+), 5 deletions(-) - -diff --git a/drivers/net/wireless/rtl8822bs/os_dep/osdep_service.c b/drivers/net/wireless/rtl8822bs/os_dep/osdep_service.c -index 86eeb995e..3727d9b49 100644 ---- a/drivers/net/wireless/rtl8822bs/os_dep/osdep_service.c -+++ b/drivers/net/wireless/rtl8822bs/os_dep/osdep_service.c -@@ -2085,14 +2085,18 @@ static int isFileReadable(const char *path, u32 *sz) - { - struct file *fp; - int ret = 0; -+#ifdef set_fs - mm_segment_t oldfs; -+#endif - char buf; - - fp = filp_open(path, O_RDONLY, 0); - if (IS_ERR(fp)) - ret = PTR_ERR(fp); - else { -+#ifdef set_fs - oldfs = get_fs(); -+#endif - set_fs(KERNEL_DS); - - if (1 != readFile(fp, &buf, 1)) -@@ -2105,8 +2109,9 @@ static int isFileReadable(const char *path, u32 *sz) - *sz = i_size_read(fp->f_dentry->d_inode); - #endif - } -- -+#ifdef set_fs - set_fs(oldfs); -+#endif - filp_close(fp, NULL); - } - return ret; -@@ -2122,18 +2127,22 @@ static int isFileReadable(const char *path, u32 *sz) - static int retriveFromFile(const char *path, u8 *buf, u32 sz) - { - int ret = -1; -+#ifdef set_fs - mm_segment_t oldfs; -+#endif - struct file *fp; - - if (path && buf) { - ret = openFile(&fp, path, O_RDONLY, 0); - if (0 == ret) { - RTW_INFO("%s openFile path:%s fp=%p\n", __FUNCTION__, path , fp); -- -+#ifdef set_fs - oldfs = get_fs(); - set_fs(KERNEL_DS); -- ret = readFile(fp, buf, sz); - set_fs(oldfs); -+#else -+ ret = readFile(fp, buf, sz); -+#endif - closeFile(fp); - - RTW_INFO("%s readFile, ret:%d\n", __FUNCTION__, ret); -@@ -2164,11 +2173,13 @@ 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); -- -+#ifdef set_fs - oldfs = get_fs(); -- set_fs(KERNEL_DS); - ret = writeFile(fp, buf, sz); - set_fs(oldfs); -+#else -+ ret = writeFile(fp, buf, sz); -+#endif - closeFile(fp); - - RTW_INFO("%s writeFile, ret:%d\n", __FUNCTION__, ret); --- -Created with Armbian build tools https://github.com/armbian/build -