ASR_BASE
Change-Id: Icf3719cc0afe3eeb3edc7fa80a2eb5199ca9dda1
diff --git a/external/subpack/kernel/macremapper/patches/02-mrm_ctlfile.c-compatibility-with-linux-5.6.patch b/external/subpack/kernel/macremapper/patches/02-mrm_ctlfile.c-compatibility-with-linux-5.6.patch
new file mode 100644
index 0000000..d103b19
--- /dev/null
+++ b/external/subpack/kernel/macremapper/patches/02-mrm_ctlfile.c-compatibility-with-linux-5.6.patch
@@ -0,0 +1,59 @@
+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(-)
+
+--- 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 __u
+ }
+
+ 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 _fop
+ read: &mrm_handle_read,
+ unlocked_ioctl: (void*)&mrm_handle_ioctl,
+ };
++#endif
+
+ int mrm_init_ctlfile( void ) {
+ struct proc_dir_entry *pde;