diff options
| author | Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> | 2021-01-31 21:03:17 -0800 |
|---|---|---|
| committer | Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> | 2021-02-01 20:48:28 -0800 |
| commit | 6558bb96912a02a86bc1fae7e7a65c20f2e41af1 (patch) | |
| tree | ff713c0bd2d5c9bb39a90aa78afac88063503b96 /kernel | |
| parent | 42b50c1da0449df568c85aef106e4dc636d7d48c (diff) | |
macremapper: linux 5.6+ compatibility
Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
Diffstat (limited to 'kernel')
2 files changed, 65 insertions, 1 deletions
diff --git a/kernel/macremapper/Makefile b/kernel/macremapper/Makefile index 69416c260..79b892ffa 100644 --- a/kernel/macremapper/Makefile +++ b/kernel/macremapper/Makefile @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=macremapper PKG_VERSION:=1.1.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ewsi/$(PKG_NAME)/tar.gz/v$(PKG_VERSION)? diff --git a/kernel/macremapper/patches/02-mrm_ctlfile.c-compatibility-with-linux-5.6.patch b/kernel/macremapper/patches/02-mrm_ctlfile.c-compatibility-with-linux-5.6.patch new file mode 100644 index 000000000..43240636f --- /dev/null +++ b/kernel/macremapper/patches/02-mrm_ctlfile.c-compatibility-with-linux-5.6.patch @@ -0,0 +1,64 @@ +From 6126f8efebf659708245ba99df6b85d7c1260668 Mon Sep 17 00:00:00 2001 +From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> +Date: Sun, 31 Jan 2021 20:53:32 -0800 +Subject: [PATCH] mrm_ctlfile.c: compatibility with linux >= 5.6 + +Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> +--- + kernelmod/mrm_ctlfile.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/kernelmod/mrm_ctlfile.c b/kernelmod/mrm_ctlfile.c +index 85a8bf9..ca8e7d8 100644 +--- a/kernelmod/mrm_ctlfile.c ++++ b/kernelmod/mrm_ctlfile.c +@@ -13,6 +13,7 @@ + #include "./macremapper_ioctl.h" + #include "./bufprintf.h" + ++#include <linux/version.h> + #include <linux/proc_fs.h> + #include <linux/uaccess.h> + #include <linux/mutex.h> +@@ -80,13 +81,14 @@ mrm_handle_read(struct file *f, char __user *buf, size_t size, loff_t *off) { + } + + static long +-mrm_handle_ioctl(struct file *f, unsigned int type, void __user *param) { ++mrm_handle_ioctl(struct file *f, unsigned int type, unsigned long arg) { + union { + struct mrm_filter_config filt_conf; + struct mrm_remap_entry remap_entry; + unsigned count; + } u; + int rv; ++ void __user *param = (void __user *)arg; + + mutex_lock(&_ctrl_mutex); + +@@ -159,6 +161,14 @@ fail_fault: + } + + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) ++static const struct proc_ops _fops = { ++ .proc_open = mrm_handle_open, ++ .proc_release = mrm_handle_release, ++ .proc_read = mrm_handle_read, ++ .proc_ioctl = mrm_handle_ioctl, ++}; ++#else + static const struct file_operations _fops = { + owner: THIS_MODULE, + open: &mrm_handle_open, +@@ -166,6 +176,7 @@ static const struct file_operations _fops = { + read: &mrm_handle_read, + unlocked_ioctl: (void*)&mrm_handle_ioctl, + }; ++#endif + + int mrm_init_ctlfile( void ) { + struct proc_dir_entry *pde; +-- +2.30.0 + |