perf 5.10.3

2020-12-27 20:48:11 +03:00
parent 6071c4a202
commit 2faef952db
55 changed files with 1838933 additions and 6 deletions
@@ -24,5 +24,6 @@ def install():
    pisitools.domove("/usr/etc/bash_completion.d/perf", "/etc/bash_completion.d")
    pisitools.removeDir("/usr/etc")

-    pisitools.domove("/usr/lib64/libperf-gtk.so", "/usr/lib/")
+    #pisitools.domove("/usr/lib64/libperf-gtk.so", "/usr/lib/")
+    pisitools.domove("/usr/lib64/traceevent", "/usr/lib/")
    pisitools.removeDir("/usr/lib64")
@@ -0,0 +1,11 @@
+--- linux-3.16/include/linux/printk.h.old	2014-08-04 18:48:30.686043266 +0200
+++ linux-3.16/include/linux/printk.h	2014-08-04 18:48:47.706218528 +0200
+@@ -37,7 +37,7 @@
+ #define CONSOLE_LOGLEVEL_SILENT  0 /* Mum's the word */
+ #define CONSOLE_LOGLEVEL_MIN	 1 /* Minimum loglevel we let people use */
+ #define CONSOLE_LOGLEVEL_QUIET	 4 /* Shhh ..., when booted with "quiet" */
+-#define CONSOLE_LOGLEVEL_DEFAULT 7 /* anything MORE serious than KERN_DEBUG */
+#define CONSOLE_LOGLEVEL_DEFAULT 4 /* anything MORE serious than KERN_DEBUG */
+ #define CONSOLE_LOGLEVEL_DEBUG	10 /* issue debug messages */
+ #define CONSOLE_LOGLEVEL_MOTORMOUTH 15	/* You can't shut this one up */
+ 
@@ -0,0 +1,21 @@
+diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
+index dd9d6190b08d..181e42bd85d3 100644
+--- a/arch/x86/kernel/cpu/microcode/core.c
+++ b/arch/x86/kernel/cpu/microcode/core.c
+@@ -85,6 +85,7 @@
+ #include <linux/syscore_ops.h>
+ 
+ #include <asm/microcode.h>
+#include <asm/microcode_intel.h>
+ #include <asm/processor.h>
+ #include <asm/cpu_device_id.h>
+ #include <asm/perf_event.h>
+@@ -465,6 +466,8 @@ static void mc_bp_resume(void)
+ 
+ 	if (uci->valid && uci->mc)
+ 		microcode_ops->apply_microcode(cpu);
+	else if (!uci->mc)
+		load_ucode_intel_ap();
+ }
+ 
+ static struct syscore_ops mc_syscore_ops = {
@@ -0,0 +1,86 @@
+diff -Nuar linux-4.9.orig/fs/aufs/posix_acl.c linux-4.9/fs/aufs/posix_acl.c
+--- linux-4.9.orig/fs/aufs/posix_acl.c	2017-04-09 09:33:00.155052337 +0300
+++ linux-4.9/fs/aufs/posix_acl.c	2017-04-09 09:34:03.760053849 +0300
+@@ -1,5 +1,18 @@
+ /*
+  * Copyright (C) 2014-2016 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+ /*
+@@ -36,6 +49,8 @@
+ 
+ 	/* always topmost only */
+ 	acl = get_acl(h_inode, type);
+	if (!IS_ERR_OR_NULL(acl))
+		set_cached_acl(inode, type, acl);
+ 
+ out:
+ 	ii_read_unlock(inode);
+@@ -77,8 +92,10 @@
+ 	ssz = au_sxattr(dentry, inode, &arg);
+ 	dput(dentry);
+ 	err = ssz;
+-	if (ssz >= 0)
+	if (ssz >= 0) {
+ 		err = 0;
+		set_cached_acl(inode, type, acl);
+	}
+ 
+ out:
+ 	return err;
+diff -Nuar linux-4.9.orig/fs/aufs/xattr.c linux-4.9/fs/aufs/xattr.c
+--- linux-4.9.orig/fs/aufs/xattr.c	2017-04-09 09:33:00.160052337 +0300
+++ linux-4.9/fs/aufs/xattr.c	2017-04-09 09:34:08.757053967 +0300
+@@ -1,11 +1,26 @@
+ /*
+  * Copyright (C) 2014-2016 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+ /*
+  * handling xattr functions
+  */
+ 
+#include <linux/fs.h>
+#include <linux/posix_acl_xattr.h>
+ #include <linux/xattr.h>
+ #include "aufs.h"
+ 
+@@ -309,7 +324,11 @@
+ };
+ 
+ static const struct xattr_handler *au_xattr_handlers[] = {
+-	&au_xattr_handler,
+#ifdef CONFIG_FS_POSIX_ACL
+	&posix_acl_access_xattr_handler,
+	&posix_acl_default_xattr_handler,
+#endif
+	&au_xattr_handler, /* must be last */
+ 	NULL
+ };
+ 
@@ -0,0 +1,54 @@
+From: Anthony G. Basile <blueness@gentoo.org>
+
+This patch adds support for a restricted user-controlled namespace on
+tmpfs filesystem used to house PaX flags.  The namespace must be of the
+form user.pax.* and its value cannot exceed a size of 8 bytes.
+
+This is needed even on all Gentoo systems so that XATTR_PAX flags
+are preserved for users who might build packages using portage on
+a tmpfs system with a non-hardened kernel and then switch to a
+hardened kernel with XATTR_PAX enabled.
+
+The namespace is added to any user with Extended Attribute support
+enabled for tmpfs.  Users who do not enable xattrs will not have
+the XATTR_PAX flags preserved.
+
+diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
+index e4629b9..6958086 100644
+--- a/include/uapi/linux/xattr.h
+++ b/include/uapi/linux/xattr.h
+@@ -63,5 +63,9 @@
+ #define XATTR_POSIX_ACL_DEFAULT  "posix_acl_default"
+ #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
+ 
+/* User namespace */
+#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
+#define XATTR_PAX_FLAGS_SUFFIX "flags"
+#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
+ 
+ #endif /* _UAPI_LINUX_XATTR_H */
+diff --git a/mm/shmem.c b/mm/shmem.c
+index 1c44af7..f23bb1b 100644
+--- a/mm/shmem.c
+++ b/mm/shmem.c
+@@ -2201,6 +2201,7 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
+ static int shmem_xattr_validate(const char *name)
+ {
+ 	struct { const char *prefix; size_t len; } arr[] = {
+		{ XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN},
+ 		{ XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
+ 		{ XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
+ 	};
+@@ -2256,6 +2257,12 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
+ 	if (err)
+ 		return err;
+ 
+	if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) {
+		if (strcmp(name, XATTR_NAME_PAX_FLAGS))
+			return -EOPNOTSUPP;
+		if (size > 8)
+			return -EINVAL;
+	}
+ 	return simple_xattr_set(&info->xattrs, name, value, size, flags);
+ }
+ 
@@ -0,0 +1,22 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Subject: fs: Enable link security restrictions by default
+Date: Fri, 02 Nov 2012 05:32:06 +0000
+Bug-Debian: https://bugs.debian.org/609455
+Forwarded: not-needed
+
+This reverts commit 561ec64ae67ef25cac8d72bb9c4bfc955edfd415
+('VFS: don't do protected {sym,hard}links by default').
+
+--- a/fs/namei.c
+++ b/fs/namei.c
+@@ -651,8 +651,8 @@ static inline void put_link(struct namei
+ 	path_put(link);
+ }
+ 
+-int sysctl_protected_symlinks __read_mostly = 0;
+-int sysctl_protected_hardlinks __read_mostly = 0;
+int sysctl_protected_symlinks __read_mostly = 1;
+int sysctl_protected_hardlinks __read_mostly = 1;
+ 
+ /**
+  * may_follow_link - Check symlink following for unsafe situations
@@ -0,0 +1,67 @@
+diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
+index cb96296..6c242ed 100644
+--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
+@@ -269,6 +276,61 @@  static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
+ 	},
+ 
+ 	/*
+	 * The following Lenovo models have a broken workaround in the
+	 * acpi_video backlight implementation to meet the Windows 8
+	 * requirement of 101 backlight levels. Reverting to pre-Win8
+	 * behavior fixes the problem.
+	 */
+	{
+	.callback = dmi_disable_osi_win8,
+	.ident = "Lenovo ThinkPad L430",
+	.matches = {
+		     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+		     DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad L430"),
+		},
+	},
+	{
+	.callback = dmi_disable_osi_win8,
+	.ident = "Lenovo ThinkPad T430s",
+	.matches = {
+		     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+		     DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T430s"),
+		},
+	},
+	{
+	.callback = dmi_disable_osi_win8,
+	.ident = "Lenovo ThinkPad T530",
+	.matches = {
+		     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+		     DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T530"),
+		},
+	},
+	{
+	.callback = dmi_disable_osi_win8,
+	.ident = "Lenovo ThinkPad W530",
+	.matches = {
+		     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+		     DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad W530"),
+		},
+	},
+	{
+	.callback = dmi_disable_osi_win8,
+	.ident = "Lenovo ThinkPad X1 Carbon",
+	.matches = {
+		     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+		     DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X1 Carbon"),
+		},
+	},
+	{
+	.callback = dmi_disable_osi_win8,
+	.ident = "Lenovo ThinkPad X230",
+	.matches = {
+		     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+		     DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X230"),
+		},
+	},
+
+	/*
+ 	 * BIOS invocation of _OSI(Linux) is almost always a BIOS bug.
+ 	 * Linux ignores it, except for the machines enumerated below.
+ 	 */
+
@@ -0,0 +1,30 @@
+--- a/init/do_mounts.c	2014-08-26 08:03:30.000013100 -0400
+++ b/init/do_mounts.c	2014-08-26 08:11:19.720014712 -0400
+@@ -484,7 +484,10 @@ void __init change_floppy(char *fmt, ...
+ 	va_start(args, fmt);
+ 	vsprintf(buf, fmt, args);
+ 	va_end(args);
+-	fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
+	if (saved_root_name[0])
+		fd = sys_open(saved_root_name, O_RDWR | O_NDELAY, 0);
+	else
+		fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
+ 	if (fd >= 0) {
+ 		sys_ioctl(fd, FDEJECT, 0);
+ 		sys_close(fd);
+@@ -527,8 +530,13 @@ void __init mount_root(void)
+ 	}
+ #endif
+ #ifdef CONFIG_BLOCK
+-	create_dev("/dev/root", ROOT_DEV);
+-	mount_block_root("/dev/root", root_mountflags);
+	if (saved_root_name[0]) {
+		create_dev(saved_root_name, ROOT_DEV);
+		mount_block_root(saved_root_name, root_mountflags);
+	} else {
+		create_dev("/dev/root", ROOT_DEV);
+		mount_block_root("/dev/root", root_mountflags);
+	}
+ #endif
+ }
+ 
@@ -0,0 +1,24 @@
+diff --git a/kernel/kmod.c b/kernel/kmod.c
+index fb32636..d968882 100644
+--- a/kernel/kmod.c
+++ b/kernel/kmod.c
+@@ -575,7 +575,8 @@
+ 		call_usermodehelper_freeinfo(sub_info);
+ 		return -EINVAL;
+ 	}
+-	helper_lock();
+	if (!(current->flags & PF_FREEZER_SKIP))
+		helper_lock();
+ 	if (!khelper_wq || usermodehelper_disabled) {
+ 		retval = -EBUSY;
+ 		goto out;
+@@ -611,7 +612,8 @@ wait_done:
+ out:
+ 	call_usermodehelper_freeinfo(sub_info);
+ unlock:
+-	helper_unlock();
+	if (!(current->flags & PF_FREEZER_SKIP))
+		helper_unlock();
+ 	return retval;
+ }
+ EXPORT_SYMBOL(call_usermodehelper_exec);
@@ -0,0 +1,143 @@
+--- a/Kconfig
+++ b/Kconfig
+@@ -8,4 +8,6 @@ config SRCARCH
+ 	string
+ 	option env="SRCARCH"
+ 
+source "distro/Kconfig"
+
+ source "arch/$SRCARCH/Kconfig"
+--- /dev/null
+++ b/distro/Kconfig
+@@ -0,0 +1,131 @@
+menu "Gentoo Linux"
+
+config GENTOO_LINUX
+	bool "Gentoo Linux support"
+
+	default y
+
+	help
+		In order to boot Gentoo Linux a minimal set of config settings needs to
+		be enabled in the kernel; to avoid the users from having to enable them
+		manually as part of a Gentoo Linux installation or a new clean config,
+		we enable these config settings by default for convenience.
+
+		See the settings that become available for more details and fine-tuning.
+
+config GENTOO_LINUX_UDEV
+	bool "Linux dynamic and persistent device naming (userspace devfs) support"
+
+	depends on GENTOO_LINUX
+	default y if GENTOO_LINUX
+
+	select DEVTMPFS
+	select TMPFS
+
+	select MMU
+	select SHMEM
+
+	help
+		In order to boot Gentoo Linux a minimal set of config settings needs to
+		be enabled in the kernel; to avoid the users from having to enable them
+		manually as part of a Gentoo Linux installation or a new clean config,
+		we enable these config settings by default for convenience.
+
+		Currently this only selects TMPFS, DEVTMPFS and their dependencies.
+		TMPFS is enabled to maintain a tmpfs file system at /dev/shm, /run and
+		/sys/fs/cgroup; DEVTMPFS to maintain a devtmpfs file system at /dev.
+
+		Some of these are critical files that need to be available early in the
+		boot process; if not available, it causes sysfs and udev to malfunction.
+
+		To ensure Gentoo Linux boots, it is best to leave this setting enabled;
+		if you run a custom setup, you could consider whether to disable this.
+
+config GENTOO_LINUX_PORTAGE
+	bool "Select options required by Portage features"
+
+	depends on GENTOO_LINUX
+	default y if GENTOO_LINUX
+
+	select CGROUPS
+	select NAMESPACES
+	select IPC_NS
+	select NET_NS
+
+	help
+		This enables options required by various Portage FEATURES.
+		Currently this selects:
+
+		CGROUPS     (required for FEATURES=cgroup)
+		IPC_NS      (required for FEATURES=ipc-sandbox)
+		NET_NS      (required for FEATURES=network-sandbox)
+
+		It is highly recommended that you leave this enabled as these FEATURES
+		are, or will soon be, enabled by default.
+
+menu "Support for init systems, system and service managers"
+	visible if GENTOO_LINUX
+
+config GENTOO_LINUX_INIT_SCRIPT
+	bool "OpenRC, runit and other script based systems and managers"
+
+	default y if GENTOO_LINUX
+
+	depends on GENTOO_LINUX
+
+	select BINFMT_SCRIPT
+
+	help
+		The init system is the first thing that loads after the kernel booted.
+
+		These config settings allow you to select which init systems to support;
+		instead of having to select all the individual settings all over the
+		place, these settings allows you to select all the settings at once.
+
+		This particular setting enables all the known requirements for OpenRC,
+		runit and similar script based systems and managers.
+
+		If you are unsure about this, it is best to leave this setting enabled.
+
+config GENTOO_LINUX_INIT_SYSTEMD
+	bool "systemd"
+
+	default n
+
+	depends on GENTOO_LINUX && GENTOO_LINUX_UDEV
+
+	select AUTOFS4_FS
+	select BLK_DEV_BSG
+	select CGROUPS
+	select DEVPTS_MULTIPLE_INSTANCES
+	select EPOLL
+	select FANOTIFY
+	select FHANDLE
+	select INOTIFY_USER
+	select NET
+	select NET_NS
+	select PROC_FS
+	select SIGNALFD
+	select SYSFS
+	select TIMERFD
+
+	select ANON_INODES
+	select BLOCK
+	select EVENTFD
+	select FSNOTIFY
+	select INET
+	select NLATTR
+
+	help
+		The init system is the first thing that loads after the kernel booted.
+
+		These config settings allow you to select which init systems to support;
+		instead of having to select all the individual settings all over the
+		place, these settings allows you to select all the settings at once.
+
+		This particular setting enables all the known requirements for systemd;
+		it also enables suggested optional settings, as the package suggests to.
+
+endmenu
+
+endmenu
@@ -0,0 +1,104 @@
+From a828d56aebc0735676be23734cccf31e279c0d1b Mon Sep 17 00:00:00 2001
+From: Paolo Valente <paolo.valente@unimore.it>
+Date: Mon, 8 Dec 2014 16:04:25 +0100
+Subject: [PATCH 1/3] block: cgroups, kconfig, build bits for BFQ-v7r7-3.19
+
+Update Kconfig.iosched and do the related Makefile changes to include
+kernel configuration options for BFQ. Also add the bfqio controller
+to the cgroups subsystem.
+
+Signed-off-by: Paolo Valente <paolo.valente@unimore.it>
+Signed-off-by: Arianna Avanzini <avanzini.arianna@gmail.com>
+---
+ block/Kconfig.iosched         | 32 ++++++++++++++++++++++++++++++++
+ block/Makefile                |  1 +
+ include/linux/cgroup_subsys.h |  4 ++++
+ 3 files changed, 37 insertions(+)
+
+diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched
+index 421bef9..0ee5f0f 100644
+--- a/block/Kconfig.iosched
+++ b/block/Kconfig.iosched
+@@ -39,6 +39,27 @@ config CFQ_GROUP_IOSCHED
+ 	---help---
+ 	  Enable group IO scheduling in CFQ.
+ 
+config IOSCHED_BFQ
+	tristate "BFQ I/O scheduler"
+	default n
+	---help---
+	  The BFQ I/O scheduler tries to distribute bandwidth among
+	  all processes according to their weights.
+	  It aims at distributing the bandwidth as desired, independently of
+	  the disk parameters and with any workload. It also tries to
+	  guarantee low latency to interactive and soft real-time
+	  applications. If compiled built-in (saying Y here), BFQ can
+	  be configured to support hierarchical scheduling.
+
+config CGROUP_BFQIO
+	bool "BFQ hierarchical scheduling support"
+	depends on CGROUPS && IOSCHED_BFQ=y
+	default n
+	---help---
+	  Enable hierarchical scheduling in BFQ, using the cgroups
+	  filesystem interface.  The name of the subsystem will be
+	  bfqio.
+
+ choice
+ 	prompt "Default I/O scheduler"
+ 	default DEFAULT_CFQ
+@@ -52,6 +73,16 @@ choice
+ 	config DEFAULT_CFQ
+ 		bool "CFQ" if IOSCHED_CFQ=y
+ 
+	config DEFAULT_BFQ
+		bool "BFQ" if IOSCHED_BFQ=y
+		help
+		  Selects BFQ as the default I/O scheduler which will be
+		  used by default for all block devices.
+		  The BFQ I/O scheduler aims at distributing the bandwidth
+		  as desired, independently of the disk parameters and with
+		  any workload. It also tries to guarantee low latency to
+		  interactive and soft real-time applications.
+
+ 	config DEFAULT_NOOP
+ 		bool "No-op"
+ 
+@@ -61,6 +92,7 @@ config DEFAULT_IOSCHED
+ 	string
+ 	default "deadline" if DEFAULT_DEADLINE
+ 	default "cfq" if DEFAULT_CFQ
+	default "bfq" if DEFAULT_BFQ
+ 	default "noop" if DEFAULT_NOOP
+ 
+ endmenu
+diff --git a/block/Makefile b/block/Makefile
+index 00ecc97..1ed86d5 100644
+--- a/block/Makefile
+++ b/block/Makefile
+@@ -18,6 +18,7 @@ obj-$(CONFIG_BLK_DEV_THROTTLING)	+= blk-throttle.o
+ obj-$(CONFIG_IOSCHED_NOOP)	+= noop-iosched.o
+ obj-$(CONFIG_IOSCHED_DEADLINE)	+= deadline-iosched.o
+ obj-$(CONFIG_IOSCHED_CFQ)	+= cfq-iosched.o
+obj-$(CONFIG_IOSCHED_BFQ)	+= bfq-iosched.o
+ 
+ obj-$(CONFIG_BLOCK_COMPAT)	+= compat_ioctl.o
+ obj-$(CONFIG_BLK_CMDLINE_PARSER)	+= cmdline-parser.o
+diff --git a/include/linux/cgroup_subsys.h b/include/linux/cgroup_subsys.h
+index 98c4f9b..13b010d 100644
+--- a/include/linux/cgroup_subsys.h
+++ b/include/linux/cgroup_subsys.h
+@@ -35,6 +35,10 @@ SUBSYS(net_cls)
+ SUBSYS(blkio)
+ #endif
+ 
+#if IS_ENABLED(CONFIG_CGROUP_BFQIO)
+SUBSYS(bfqio)
+#endif
+
+ #if IS_ENABLED(CONFIG_CGROUP_PERF)
+ SUBSYS(perf_event)
+ #endif
+-- 
+2.3.0
+
@@ -0,0 +1,387 @@
+WARNING - this version of the patch works with version 4.9+ of gcc and with
+kernel version 3.15.x+ and should NOT be applied when compiling on older
+versions due to name changes of the flags with the 4.9 release of gcc.
+Use the older version of this patch hosted on the same github for older
+versions of gcc. For example:
+
+corei7 --> nehalem
+corei7-avx --> sandybridge
+core-avx-i --> ivybridge
+core-avx2 --> haswell
+
+For more, see: https://gcc.gnu.org/gcc-4.9/changes.html
+
+It also changes 'atom' to 'bonnell' in accordance with the gcc v4.9 changes.
+Note that upstream is using the deprecated 'match=atom' flags when I believe it
+should use the newer 'march=bonnell' flag for atom processors.
+
+I have made that change to this patch set as well.  See the following kernel
+bug report to see if I'm right: https://bugzilla.kernel.org/show_bug.cgi?id=77461
+
+This patch will expand the number of microarchitectures to include new
+processors including: AMD K10-family, AMD Family 10h (Barcelona), AMD Family
+14h (Bobcat), AMD Family 15h (Bulldozer), AMD Family 15h (Piledriver), AMD
+Family 16h (Jaguar), Intel 1st Gen Core i3/i5/i7 (Nehalem), Intel 1.5 Gen Core
+i3/i5/i7 (Westmere), Intel 2nd Gen Core i3/i5/i7 (Sandybridge), Intel 3rd Gen
+Core i3/i5/i7 (Ivybridge), Intel 4th Gen Core i3/i5/i7 (Haswell), and Intel 5th
+Gen Core i3/i5/i7 (Broadwell). It also offers the compiler the 'native' flag.
+
+Small but real speed increases are measurable using a make endpoint comparing
+a generic kernel to one built with one of the respective microarchs.
+
+See the following experimental evidence supporting this statement:
+https://github.com/graysky2/kernel_gcc_patch
+
+REQUIREMENTS
+linux version >=3.15
+gcc version >=4.9
+
+--- a/arch/x86/include/asm/module.h	2014-08-03 18:25:02.000000000 -0400
+++ b/arch/x86/include/asm/module.h	2014-09-13 09:37:16.721385247 -0400
+@@ -15,6 +15,20 @@
+ #define MODULE_PROC_FAMILY "586MMX "
+ #elif defined CONFIG_MCORE2
+ #define MODULE_PROC_FAMILY "CORE2 "
+#elif defined CONFIG_MNATIVE
+#define MODULE_PROC_FAMILY "NATIVE "
+#elif defined CONFIG_MNEHALEM
+#define MODULE_PROC_FAMILY "NEHALEM "
+#elif defined CONFIG_MWESTMERE
+#define MODULE_PROC_FAMILY "WESTMERE "
+#elif defined CONFIG_MSANDYBRIDGE
+#define MODULE_PROC_FAMILY "SANDYBRIDGE "
+#elif defined CONFIG_MIVYBRIDGE
+#define MODULE_PROC_FAMILY "IVYBRIDGE "
+#elif defined CONFIG_MHASWELL
+#define MODULE_PROC_FAMILY "HASWELL "
+#elif defined CONFIG_MBROADWELL
+#define MODULE_PROC_FAMILY "BROADWELL "
+ #elif defined CONFIG_MATOM
+ #define MODULE_PROC_FAMILY "ATOM "
+ #elif defined CONFIG_M686
+@@ -33,6 +47,20 @@
+ #define MODULE_PROC_FAMILY "K7 "
+ #elif defined CONFIG_MK8
+ #define MODULE_PROC_FAMILY "K8 "
+#elif defined CONFIG_MK8SSE3
+#define MODULE_PROC_FAMILY "K8SSE3 "
+#elif defined CONFIG_MK10
+#define MODULE_PROC_FAMILY "K10 "
+#elif defined CONFIG_MBARCELONA
+#define MODULE_PROC_FAMILY "BARCELONA "
+#elif defined CONFIG_MBOBCAT
+#define MODULE_PROC_FAMILY "BOBCAT "
+#elif defined CONFIG_MBULLDOZER
+#define MODULE_PROC_FAMILY "BULLDOZER "
+#elif defined CONFIG_MPILEDRIVER
+#define MODULE_PROC_FAMILY "PILEDRIVER "
+#elif defined CONFIG_MJAGUAR
+#define MODULE_PROC_FAMILY "JAGUAR "
+ #elif defined CONFIG_MELAN
+ #define MODULE_PROC_FAMILY "ELAN "
+ #elif defined CONFIG_MCRUSOE
+--- a/arch/x86/Kconfig.cpu	2014-08-03 18:25:02.000000000 -0400
+++ b/arch/x86/Kconfig.cpu	2014-09-13 09:37:16.721385247 -0400
+@@ -137,9 +137,8 @@ config MPENTIUM4
+ 		-Paxville
+ 		-Dempsey
+ 
+-
+ config MK6
+-	bool "K6/K6-II/K6-III"
+	bool "AMD K6/K6-II/K6-III"
+ 	depends on X86_32
+ 	---help---
+ 	  Select this for an AMD K6-family processor.  Enables use of
+@@ -147,7 +146,7 @@ config MK6
+ 	  flags to GCC.
+ 
+ config MK7
+-	bool "Athlon/Duron/K7"
+	bool "AMD Athlon/Duron/K7"
+ 	depends on X86_32
+ 	---help---
+ 	  Select this for an AMD Athlon K7-family processor.  Enables use of
+@@ -155,12 +154,62 @@ config MK7
+ 	  flags to GCC.
+ 
+ config MK8
+-	bool "Opteron/Athlon64/Hammer/K8"
+	bool "AMD Opteron/Athlon64/Hammer/K8"
+ 	---help---
+ 	  Select this for an AMD Opteron or Athlon64 Hammer-family processor.
+ 	  Enables use of some extended instructions, and passes appropriate
+ 	  optimization flags to GCC.
+ 
+config MK8SSE3
+	bool "AMD Opteron/Athlon64/Hammer/K8 with SSE3"
+	---help---
+	  Select this for improved AMD Opteron or Athlon64 Hammer-family processors.
+	  Enables use of some extended instructions, and passes appropriate
+	  optimization flags to GCC.
+
+config MK10
+	bool "AMD 61xx/7x50/PhenomX3/X4/II/K10"
+	---help---
+	  Select this for an AMD 61xx Eight-Core Magny-Cours, Athlon X2 7x50,
+		Phenom X3/X4/II, Athlon II X2/X3/X4, or Turion II-family processor.
+	  Enables use of some extended instructions, and passes appropriate
+	  optimization flags to GCC.
+
+config MBARCELONA
+	bool "AMD Barcelona"
+	---help---
+	  Select this for AMD Barcelona and newer processors.
+
+	  Enables -march=barcelona
+
+config MBOBCAT
+	bool "AMD Bobcat"
+	---help---
+	  Select this for AMD Bobcat processors.
+
+	  Enables -march=btver1
+
+config MBULLDOZER
+	bool "AMD Bulldozer"
+	---help---
+	  Select this for AMD Bulldozer processors.
+
+	  Enables -march=bdver1
+
+config MPILEDRIVER
+	bool "AMD Piledriver"
+	---help---
+	  Select this for AMD Piledriver processors.
+
+	  Enables -march=bdver2
+
+config MJAGUAR
+	bool "AMD Jaguar"
+	---help---
+	  Select this for AMD Jaguar processors.
+
+	  Enables -march=btver2
+
+ config MCRUSOE
+ 	bool "Crusoe"
+ 	depends on X86_32
+@@ -251,8 +300,17 @@ config MPSC
+ 	  using the cpu family field
+ 	  in /proc/cpuinfo. Family 15 is an older Xeon, Family 6 a newer one.
+ 
+config MATOM
+	bool "Intel Atom"
+	---help---
+
+	  Select this for the Intel Atom platform. Intel Atom CPUs have an
+	  in-order pipelining architecture and thus can benefit from
+	  accordingly optimized code. Use a recent GCC with specific Atom
+	  support in order to fully benefit from selecting this option.
+
+ config MCORE2
+-	bool "Core 2/newer Xeon"
+	bool "Intel Core 2"
+ 	---help---
+ 
+ 	  Select this for Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and
+@@ -260,14 +318,55 @@ config MCORE2
+ 	  family in /proc/cpuinfo. Newer ones have 6 and older ones 15
+ 	  (not a typo)
+ 
+-config MATOM
+-	bool "Intel Atom"
+	  Enables -march=core2
+
+config MNEHALEM
+	bool "Intel Nehalem"
+ 	---help---
+ 
+-	  Select this for the Intel Atom platform. Intel Atom CPUs have an
+-	  in-order pipelining architecture and thus can benefit from
+-	  accordingly optimized code. Use a recent GCC with specific Atom
+-	  support in order to fully benefit from selecting this option.
+	  Select this for 1st Gen Core processors in the Nehalem family.
+
+	  Enables -march=nehalem
+
+config MWESTMERE
+	bool "Intel Westmere"
+	---help---
+
+	  Select this for the Intel Westmere formerly Nehalem-C family.
+
+	  Enables -march=westmere
+
+config MSANDYBRIDGE
+	bool "Intel Sandy Bridge"
+	---help---
+
+	  Select this for 2nd Gen Core processors in the Sandy Bridge family.
+
+	  Enables -march=sandybridge
+
+config MIVYBRIDGE
+	bool "Intel Ivy Bridge"
+	---help---
+
+	  Select this for 3rd Gen Core processors in the Ivy Bridge family.
+
+	  Enables -march=ivybridge
+
+config MHASWELL
+	bool "Intel Haswell"
+	---help---
+
+	  Select this for 4th Gen Core processors in the Haswell family.
+
+	  Enables -march=haswell
+
+config MBROADWELL
+	bool "Intel Broadwell"
+	---help---
+
+	  Select this for 5th Gen Core processors in the Broadwell family.
+
+	  Enables -march=broadwell
+ 
+ config GENERIC_CPU
+ 	bool "Generic-x86-64"
+@@ -276,6 +375,19 @@ config GENERIC_CPU
+ 	  Generic x86-64 CPU.
+ 	  Run equally well on all x86-64 CPUs.
+ 
+config MNATIVE
+ bool "Native optimizations autodetected by GCC"
+ ---help---
+
+   GCC 4.2 and above support -march=native, which automatically detects
+   the optimum settings to use based on your processor. -march=native 
+   also detects and applies additional settings beyond -march specific
+   to your CPU, (eg. -msse4). Unless you have a specific reason not to
+   (e.g. distcc cross-compiling), you should probably be using
+   -march=native rather than anything listed below.
+
+   Enables -march=native
+
+ endchoice
+ 
+ config X86_GENERIC
+@@ -300,7 +412,7 @@ config X86_INTERNODE_CACHE_SHIFT
+ config X86_L1_CACHE_SHIFT
+ 	int
+ 	default "7" if MPENTIUM4 || MPSC
+-	default "6" if MK7 || MK8 || MPENTIUMM || MCORE2 || MATOM || MVIAC7 || X86_GENERIC || GENERIC_CPU
+	default "6" if MK7 || MK8 || MK8SSE3 || MK10 || MBARCELONA || MBOBCAT || MBULLDOZER || MPILEDRIVER || MJAGUAR || MPENTIUMM || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || BROADWELL || MNATIVE || MATOM || MVIAC7 || X86_GENERIC || GENERIC_CPU
+ 	default "4" if MELAN || M486 || MGEODEGX1
+ 	default "5" if MWINCHIP3D || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX
+ 
+@@ -331,11 +443,11 @@ config X86_ALIGNMENT_16
+ 
+ config X86_INTEL_USERCOPY
+ 	def_bool y
+-	depends on MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M586MMX || X86_GENERIC || MK8 || MK7 || MEFFICEON || MCORE2
+	depends on MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M586MMX || X86_GENERIC || MK8 || MK8SSE3 || MK7 || MEFFICEON || MCORE2 || MK10 || MBARCELONA || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MNATIVE
+ 
+ config X86_USE_PPRO_CHECKSUM
+ 	def_bool y
+-	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MVIAC3_2 || MVIAC7 || MEFFICEON || MGEODE_LX || MCORE2 || MATOM
+	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MK10 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MK8SSE3 || MVIAC3_2 || MVIAC7 || MEFFICEON || MGEODE_LX || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MATOM || MNATIVE
+ 
+ config X86_USE_3DNOW
+ 	def_bool y
+@@ -359,17 +471,17 @@ config X86_P6_NOP
+ 
+ config X86_TSC
+ 	def_bool y
+-	depends on (MWINCHIP3D || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2 || MATOM) || X86_64
+	depends on (MWINCHIP3D || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MK8SSE3 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MNATIVE || MATOM) || X86_64
+ 
+ config X86_CMPXCHG64
+ 	def_bool y
+-	depends on X86_PAE || X86_64 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MATOM
+	depends on X86_PAE || X86_64 || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MATOM || MNATIVE
+ 
+ # this should be set for all -march=.. options where the compiler
+ # generates cmov.
+ config X86_CMOV
+ 	def_bool y
+-	depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
+	depends on (MK8 || MK8SSE3 || MK10 || MBARCELONA || MBOBCAT || MBULLDOZER || MPILEDRIVER || MJAGUAR || MK7 || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MNATIVE || MATOM || MGEODE_LX)
+ 
+ config X86_MINIMUM_CPU_FAMILY
+ 	int
+--- a/arch/x86/Makefile	2014-08-03 18:25:02.000000000 -0400
+++ b/arch/x86/Makefile	2014-09-13 09:37:16.721385247 -0400
+@@ -92,13 +92,33 @@ else
+ 	KBUILD_CFLAGS += $(call cc-option,-mpreferred-stack-boundary=3)
+ 
+         # FIXME - should be integrated in Makefile.cpu (Makefile_32.cpu)
+        cflags-$(CONFIG_MNATIVE) += $(call cc-option,-march=native)
+         cflags-$(CONFIG_MK8) += $(call cc-option,-march=k8)
+        cflags-$(CONFIG_MK8SSE3) += $(call cc-option,-march=k8-sse3,-mtune=k8)
+        cflags-$(CONFIG_MK10) += $(call cc-option,-march=amdfam10)
+        cflags-$(CONFIG_MBARCELONA) += $(call cc-option,-march=barcelona)
+        cflags-$(CONFIG_MBOBCAT) += $(call cc-option,-march=btver1)
+        cflags-$(CONFIG_MBULLDOZER) += $(call cc-option,-march=bdver1)
+        cflags-$(CONFIG_MPILEDRIVER) += $(call cc-option,-march=bdver2)
+        cflags-$(CONFIG_MJAGUAR) += $(call cc-option,-march=btver2)
+         cflags-$(CONFIG_MPSC) += $(call cc-option,-march=nocona)
+ 
+         cflags-$(CONFIG_MCORE2) += \
+-                $(call cc-option,-march=core2,$(call cc-option,-mtune=generic))
+-	cflags-$(CONFIG_MATOM) += $(call cc-option,-march=atom) \
+-		$(call cc-option,-mtune=atom,$(call cc-option,-mtune=generic))
+                $(call cc-option,-march=core2,$(call cc-option,-mtune=core2))
+        cflags-$(CONFIG_MNEHALEM) += \
+                $(call cc-option,-march=nehalem,$(call cc-option,-mtune=nehalem))
+        cflags-$(CONFIG_MWESTMERE) += \
+                $(call cc-option,-march=westmere,$(call cc-option,-mtune=westmere))
+        cflags-$(CONFIG_MSANDYBRIDGE) += \
+                $(call cc-option,-march=sandybridge,$(call cc-option,-mtune=sandybridge))
+        cflags-$(CONFIG_MIVYBRIDGE) += \
+                $(call cc-option,-march=ivybridge,$(call cc-option,-mtune=ivybridge))
+        cflags-$(CONFIG_MHASWELL) += \
+                $(call cc-option,-march=haswell,$(call cc-option,-mtune=haswell))
+        cflags-$(CONFIG_MBROADWELL) += \
+                $(call cc-option,-march=broadwell,$(call cc-option,-mtune=broadwell))
+        cflags-$(CONFIG_MATOM) += $(call cc-option,-march=bonnell) \
+                $(call cc-option,-mtune=bonnell,$(call cc-option,-mtune=generic))
+         cflags-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=generic)
+         KBUILD_CFLAGS += $(cflags-y)
+ 
+--- a/arch/x86/Makefile_32.cpu	2014-08-03 18:25:02.000000000 -0400
+++ b/arch/x86/Makefile_32.cpu	2014-09-13 09:37:16.721385247 -0400
+@@ -23,7 +23,15 @@ cflags-$(CONFIG_MK6)		+= -march=k6
+ # Please note, that patches that add -march=athlon-xp and friends are pointless.
+ # They make zero difference whatsosever to performance at this time.
+ cflags-$(CONFIG_MK7)		+= -march=athlon
+cflags-$(CONFIG_MNATIVE) += $(call cc-option,-march=native)
+ cflags-$(CONFIG_MK8)		+= $(call cc-option,-march=k8,-march=athlon)
+cflags-$(CONFIG_MK8SSE3)		+= $(call cc-option,-march=k8-sse3,-march=athlon)
+cflags-$(CONFIG_MK10)	+= $(call cc-option,-march=amdfam10,-march=athlon)
+cflags-$(CONFIG_MBARCELONA)	+= $(call cc-option,-march=barcelona,-march=athlon)
+cflags-$(CONFIG_MBOBCAT)	+= $(call cc-option,-march=btver1,-march=athlon)
+cflags-$(CONFIG_MBULLDOZER)	+= $(call cc-option,-march=bdver1,-march=athlon)
+cflags-$(CONFIG_MPILEDRIVER)	+= $(call cc-option,-march=bdver2,-march=athlon)
+cflags-$(CONFIG_MJAGUAR)	+= $(call cc-option,-march=btver2,-march=athlon)
+ cflags-$(CONFIG_MCRUSOE)	+= -march=i686 $(align)-functions=0 $(align)-jumps=0 $(align)-loops=0
+ cflags-$(CONFIG_MEFFICEON)	+= -march=i686 $(call tune,pentium3) $(align)-functions=0 $(align)-jumps=0 $(align)-loops=0
+ cflags-$(CONFIG_MWINCHIPC6)	+= $(call cc-option,-march=winchip-c6,-march=i586)
+@@ -32,8 +40,14 @@ cflags-$(CONFIG_MCYRIXIII)	+= $(call cc-
+ cflags-$(CONFIG_MVIAC3_2)	+= $(call cc-option,-march=c3-2,-march=i686)
+ cflags-$(CONFIG_MVIAC7)		+= -march=i686
+ cflags-$(CONFIG_MCORE2)		+= -march=i686 $(call tune,core2)
+-cflags-$(CONFIG_MATOM)		+= $(call cc-option,-march=atom,$(call cc-option,-march=core2,-march=i686)) \
+-	$(call cc-option,-mtune=atom,$(call cc-option,-mtune=generic))
+cflags-$(CONFIG_MNEHALEM)	+= -march=i686 $(call tune,nehalem)
+cflags-$(CONFIG_MWESTMERE)	+= -march=i686 $(call tune,westmere)
+cflags-$(CONFIG_MSANDYBRIDGE)	+= -march=i686 $(call tune,sandybridge)
+cflags-$(CONFIG_MIVYBRIDGE)	+= -march=i686 $(call tune,ivybridge)
+cflags-$(CONFIG_MHASWELL)	+= -march=i686 $(call tune,haswell)
+cflags-$(CONFIG_MBROADWELL)	+= -march=i686 $(call tune,broadwell)
+cflags-$(CONFIG_MATOM)		+= $(call cc-option,-march=bonnell,$(call cc-option,-march=core2,-march=i686)) \
+	$(call cc-option,-mtune=bonnell,$(call cc-option,-mtune=generic))
+ 
+ # AMD Elan support
+ cflags-$(CONFIG_MELAN)		+= -march=i486
@@ -0,0 +1,53 @@
+
+Include 3rdparty directory into the main build-system.
+
+Original author is unknown.
+(Was either Juan Quintela or Jeff Garzik)
+
+Signed-off-by: Luiz Fernando N. Capitulino <lcapitulino@mandriva.com.br>
+Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
+[Simplified for Mageia 7 / kernel 5.1.6 and up / tmb]
+Signed-off-by: Thomas Backlund <tmb@mageia.org>
+
+---
+ Makefile           |    2 +-
+ arch/arm/Kconfig   |    2 ++
+ arch/arm64/Kconfig |    2 ++
+ arch/x86/Kconfig   |    2 ++
+ 4 files changed, 7 insertions(+), 1 deletion(-)
+
+--- linux-5.8/arch/arm64/Kconfig.orig	2020-08-05 16:08:02.466740952 +0200
+++ linux-5.8/arch/arm64/Kconfig	2020-08-05 16:08:13.368741815 +0200
+@@ -1910,3 +1910,5 @@ source "arch/arm64/kvm/Kconfig"
+ if CRYPTO
+ source "arch/arm64/crypto/Kconfig"
+ endif
+
+source "3rdparty/Kconfig"
+--- linux-5.8/Makefile.orig	2020-08-05 16:09:32.265748061 +0200
+++ linux-5.8/Makefile	2020-08-05 16:10:02.553750458 +0200
+@@ -651,7 +651,7 @@ endif
+ ifeq ($(KBUILD_EXTMOD),)
+ # Objects we will link into vmlinux / subdirs we need to visit
+ core-y		:= init/ usr/
+-drivers-y	:= drivers/ sound/
+drivers-y	:= drivers/ sound/ 3rdparty/
+ drivers-$(CONFIG_SAMPLES) += samples/
+ drivers-y	+= net/ virt/
+ libs-y		:= lib/
+--- linux-5.8/arch/x86/Kconfig.orig	2020-08-05 16:10:48.805754119 +0200
+++ linux-5.8/arch/x86/Kconfig	2020-08-05 16:11:04.602755370 +0200
+@@ -2913,3 +2913,5 @@ source "drivers/firmware/Kconfig"
+ source "arch/x86/kvm/Kconfig"
+ 
+ source "arch/x86/Kconfig.assembler"
+
+source "3rdparty/Kconfig"
+--- linux-5.8/arch/arm/Kconfig.orig	2020-08-05 16:12:08.314760413 +0200
+++ linux-5.8/arch/arm/Kconfig	2020-08-05 16:12:22.786761559 +0200
+@@ -2064,3 +2064,5 @@ source "arch/arm/crypto/Kconfig"
+ endif
+ 
+ source "arch/arm/Kconfig.assembler"
+
+source "3rdparty/Kconfig"
@@ -0,0 +1,21 @@
+
+ 3rdparty/Kconfig  |    5 +++++
+ 3rdparty/Makefile |    3 +++
+ 2 files changed, 8 insertions(+)
+
+diff -Nurp linux-5.1.6/3rdparty/Kconfig linux-5.1.6-3rd/3rdparty/Kconfig
+--- linux-5.1.6/3rdparty/Kconfig	1970-01-01 02:00:00.000000000 +0200
+++ linux-5.1.6-3rd/3rdparty/Kconfig	2019-05-31 23:02:53.380127780 +0300
+@@ -0,0 +1,5 @@
+#
+
+menu "External 3rdparty kernel additions"
+
+endmenu
+diff -Nurp linux-5.1.6/3rdparty/Makefile linux-5.1.6-3rd/3rdparty/Makefile
+--- linux-5.1.6/3rdparty/Makefile	1970-01-01 02:00:00.000000000 +0200
+++ linux-5.1.6-3rd/3rdparty/Makefile	2019-05-31 23:03:58.338529850 +0300
+@@ -0,0 +1,3 @@
+#
+
+obj- := 3rdparty.o  # Dummy rule to force built-in.o to be made
@@ -0,0 +1,45 @@
+diff -up ./3rdparty/rtl8723de/Kconfig.tv ./3rdparty/rtl8723de/Kconfig
+--- ./3rdparty/rtl8723de/Kconfig.tv	2020-10-13 21:02:42.452125426 +0200
+++ ./3rdparty/rtl8723de/Kconfig	2020-10-13 20:59:14.012371730 +0200
+@@ -1,6 +1,6 @@
+ config RTL8723DE
+ 	tristate "Realtek 8723DE PCI WiFi"
+ 	depends on PCI
+-	---help---
+	help
+ 	  Help message of RTL8723DE
+ 
+diff -up ./3rdparty/rtl8812au/Kconfig.tv ./3rdparty/rtl8812au/Kconfig
+--- ./3rdparty/rtl8812au/Kconfig.tv	2020-10-13 21:02:36.391016614 +0200
+++ ./3rdparty/rtl8812au/Kconfig	2020-10-13 20:59:07.421226249 +0200
+@@ -1,6 +1,6 @@
+ config RTL8812AU
+ 	tristate "Realtek 8812au USB WiFi"
+ 	depends on USB
+-	---help---
+	help
+ 	  Help message of 8812au
+ 
+diff -up ./3rdparty/rtl8821ce/Kconfig.tv ./3rdparty/rtl8821ce/Kconfig
+--- ./3rdparty/rtl8821ce/Kconfig.tv	2020-10-13 16:09:11.157856145 +0200
+++ ./3rdparty/rtl8821ce/Kconfig	2020-10-13 20:58:17.242118685 +0200
+@@ -1,6 +1,6 @@
+ config RTL8821CE
+ 	tristate "Realtek 8821C PCI WiFi"
+ 	depends on PCI
+-	---help---
+	help
+ 	  Help message of RTL8821CE
+ 
+diff -up ./3rdparty/viahss/Kconfig.tv ./3rdparty/viahss/Kconfig
+--- ./3rdparty/viahss/Kconfig.tv	2020-10-13 21:02:44.844168369 +0200
+++ ./3rdparty/viahss/Kconfig	2020-10-13 20:59:19.875488718 +0200
+@@ -1,7 +1,7 @@
+ config VIAHSS
+ 	tristate "VIA High Speed Serial"
+ 	depends on SERIAL_CORE && m
+-	---help---
+	help
+ 	  VIA High Speed Serial is a little kernel module (1 KB) which enables
+ 	  high speed serial port modes of VIA VT82C686A or VT82C686B
+ 	  southbridge-equipped motherboards. With this module, you can use the
@@ -0,0 +1,7 @@
+--- linux-2.6.24.orig/3rdparty/ndiswrapper/Kconfig	1969-12-31 21:00:00.000000000 -0300
+++ linux-2.6.24/3rdparty/ndiswrapper/Kconfig	2007-11-26 15:11:31.000000000 -0200
+@@ -0,0 +1,4 @@
+
+config NDISWRAPPER
+       tristate "NDIS driver wrapper support"
+       depends on PCI && USB && !X86_64_XEN
@@ -0,0 +1,45 @@
+--- linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/Makefile.orig	2013-11-28 21:42:10.000000000 +0200
+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/Makefile	2013-11-30 21:41:19.550504380 +0200
+@@ -9,24 +9,10 @@ DISTFILES = \
+ 	winnt_types.h workqueue.c wrapmem.c wrapmem.h wrapndis.c wrapndis.h \
+ 	wrapper.c wrapper.h
+ 
+-# By default, we try to compile the modules for the currently running
+-# kernel.  But it's the first approximation, as we will re-read the
+-# version from the kernel sources.
+-KVERS_UNAME ?= $(shell uname -r)
+-
+ # KBUILD is the path to the Linux kernel build tree.  It is usually the
+ # same as the kernel source tree, except when the kernel was compiled in
+ # a separate directory.
+-KBUILD ?= $(shell readlink -f /lib/modules/$(KVERS_UNAME)/build)
+-
+-ifeq (,$(KBUILD))
+-$(error Kernel build tree not found - please set KBUILD to configured kernel)
+-endif
+-
+-KCONFIG := $(KBUILD)/.config
+-ifeq (,$(wildcard $(KCONFIG)))
+-$(error No .config found in $(KBUILD), please set KBUILD to configured kernel)
+-endif
+KBUILD ?= $(srctree)
+ 
+ ifneq (,$(wildcard $(KBUILD)/include/linux/version.h))
+ ifneq (,$(wildcard $(KBUILD)/include/generated/uapi/linux/version.h))
+@@ -43,16 +29,9 @@ endif
+ ifeq (,$(wildcard $(VERSION_H)))
+ VERSION_H := $(KBUILD)/include/linux/version.h
+ endif
+-ifeq (,$(wildcard $(VERSION_H)))
+-$(error Please run 'make modules_prepare' in $(KBUILD))
+-endif
+ 
+ KVERS := $(shell sed -ne 's/"//g;s/^\#define UTS_RELEASE //p' $(VERSION_H))
+ 
+-ifeq (,$(KVERS))
+-$(error Cannot find UTS_RELEASE in $(VERSION_H), please report)
+-endif
+-
+ INST_DIR = /lib/modules/$(KVERS)/misc
+ 
+ SRC_DIR=$(shell pwd)
@@ -0,0 +1,16 @@
+--- linux/3rdparty/Kconfig.orig	2019-05-31 23:02:53.380127780 +0300
+++ linux/3rdparty/Kconfig	2019-05-31 23:26:48.844304457 +0300
+@@ -2,4 +2,6 @@
+ 
+ menu "External 3rdparty kernel additions"
+ 
+source "3rdparty/ndiswrapper/Kconfig"
+
+ endmenu
+--- linux/3rdparty/Makefile.orig	2019-05-31 23:03:58.338529850 +0300
+++ linux/3rdparty/Makefile	2019-05-31 23:27:35.405319287 +0300
+@@ -1,3 +1,4 @@
+ #
+ 
+ obj- := 3rdparty.o  # Dummy rule to force built-in.o to be made
+obj-$(CONFIG_NDISWRAPPER) += ndiswrapper/
@@ -0,0 +1,244 @@
+diff -urp linux-5.6.3/3rdparty/rtl8723de.orig/os_dep/linux/rtw_proc.c linux-5.6.3/3rdparty/rtl8723de/os_dep/linux/rtw_proc.c
+--- linux-5.6.3/3rdparty/rtl8723de.orig/os_dep/linux/rtw_proc.c	2020-04-10 17:12:12.495541693 +0300
+++ linux-5.6.3/3rdparty/rtl8723de/os_dep/linux/rtw_proc.c	2020-04-10 17:22:51.328340275 +0300
+@@ -68,12 +68,19 @@ inline struct proc_dir_entry *rtw_proc_c
+ 	return entry;
+ }
+ 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0))
+inline struct proc_dir_entry *rtw_proc_create_entry(const char *name, struct proc_dir_entry *parent,
+	const struct proc_ops *pops, void * data)
+#else
+ inline struct proc_dir_entry *rtw_proc_create_entry(const char *name, struct proc_dir_entry *parent,
+ 	const struct file_operations *fops, void * data)
+#endif
+ {
+ 	struct proc_dir_entry *entry;
+ 
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0))
+	entry = proc_create_data(name,  S_IFREG | S_IRUGO | S_IWUGO, parent, pops, data);
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26))
+ 	entry = proc_create_data(name,  S_IFREG | S_IRUGO | S_IWUGO, parent, fops, data);
+ #else
+ 	entry = create_proc_entry(name, S_IFREG | S_IRUGO | S_IWUGO, parent);
+@@ -219,7 +226,24 @@ static ssize_t rtw_drv_proc_write(struct
+ 	return -EROFS;
+ }
+ 
+-static const struct file_operations rtw_drv_proc_seq_fops = {
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0))
+static const struct proc_ops rtw_drv_proc_seq_ops = {
+	.proc_open = rtw_drv_proc_open,
+	.proc_read = seq_read,
+	.proc_lseek = seq_lseek,
+	.proc_release = seq_release,
+	.proc_write = rtw_drv_proc_write,
+};
+
+static const struct proc_ops rtw_drv_proc_sseq_ops = {
+	.proc_open = rtw_drv_proc_open,
+	.proc_read = seq_read,
+	.proc_lseek = seq_lseek,
+	.proc_release = single_release,
+	.proc_write = rtw_drv_proc_write,
+};
+#else
+static const struct file_operations rtw_drv_proc_seq_ops = {
+ 	.owner = THIS_MODULE,
+ 	.open = rtw_drv_proc_open,
+ 	.read = seq_read,
+@@ -228,7 +252,7 @@ static const struct file_operations rtw_
+ 	.write = rtw_drv_proc_write,
+ };
+ 
+-static const struct file_operations rtw_drv_proc_sseq_fops = {
+static const struct file_operations rtw_drv_proc_sseq_ops = {
+ 	.owner = THIS_MODULE,
+ 	.open = rtw_drv_proc_open,
+ 	.read = seq_read,
+@@ -236,6 +260,7 @@ static const struct file_operations rtw_
+ 	.release = single_release,
+ 	.write = rtw_drv_proc_write,
+ };
+#endif
+ 
+ int rtw_drv_proc_init(void)
+ {
+@@ -257,9 +282,9 @@ int rtw_drv_proc_init(void)
+ 
+ 	for (i = 0; i < drv_proc_hdls_num; i++) {
+ 		if (drv_proc_hdls[i].type == RTW_PROC_HDL_TYPE_SEQ)
+-			entry = rtw_proc_create_entry(drv_proc_hdls[i].name, rtw_proc, &rtw_drv_proc_seq_fops, (void *)i);
+			entry = rtw_proc_create_entry(drv_proc_hdls[i].name, rtw_proc, &rtw_drv_proc_seq_ops, (void *)i);
+ 		else if (drv_proc_hdls[i].type == RTW_PROC_HDL_TYPE_SSEQ)
+-			entry = rtw_proc_create_entry(drv_proc_hdls[i].name, rtw_proc, &rtw_drv_proc_sseq_fops, (void *)i);
+			entry = rtw_proc_create_entry(drv_proc_hdls[i].name, rtw_proc, &rtw_drv_proc_sseq_ops, (void *)i);
+ 		else
+ 			entry = NULL;
+ 
+@@ -2335,7 +2360,24 @@ static ssize_t rtw_adapter_proc_write(st
+ 	return -EROFS;
+ }
+ 
+-static const struct file_operations rtw_adapter_proc_seq_fops = {
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0))
+static const struct proc_ops rtw_adapter_proc_seq_ops = {
+	.proc_open = rtw_adapter_proc_open,
+	.proc_read = seq_read,
+	.proc_lseek = seq_lseek,
+	.proc_release = seq_release,
+	.proc_write = rtw_adapter_proc_write,
+};
+
+static const struct proc_ops rtw_adapter_proc_sseq_ops = {
+	.proc_open = rtw_adapter_proc_open,
+	.proc_read = seq_read,
+	.proc_lseek = seq_lseek,
+	.proc_release = single_release,
+	.proc_write = rtw_adapter_proc_write,
+};
+#else
+static const struct file_operations rtw_adapter_proc_seq_ops = {
+ 	.owner = THIS_MODULE,
+ 	.open = rtw_adapter_proc_open,
+ 	.read = seq_read,
+@@ -2344,7 +2386,7 @@ static const struct file_operations rtw_
+ 	.write = rtw_adapter_proc_write,
+ };
+ 
+-static const struct file_operations rtw_adapter_proc_sseq_fops = {
+static const struct file_operations rtw_adapter_proc_sseq_ops = {
+ 	.owner = THIS_MODULE,
+ 	.open = rtw_adapter_proc_open,
+ 	.read = seq_read,
+@@ -2352,6 +2394,7 @@ static const struct file_operations rtw_
+ 	.release = single_release,
+ 	.write = rtw_adapter_proc_write,
+ };
+#endif
+ 
+ int proc_get_odm_dbg_comp(struct seq_file *m, void *v)
+ {
+@@ -2670,7 +2713,24 @@ static ssize_t rtw_odm_proc_write(struct
+ 	return -EROFS;
+ }
+ 
+-static const struct file_operations rtw_odm_proc_seq_fops = {
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0))
+static const struct proc_ops rtw_odm_proc_seq_ops = {
+	.proc_open = rtw_odm_proc_open,
+	.proc_read = seq_read,
+	.proc_lseek = seq_lseek,
+	.proc_release = seq_release,
+	.proc_write = rtw_odm_proc_write,
+};
+
+static const struct proc_ops rtw_odm_proc_sseq_ops = {
+	.proc_open = rtw_odm_proc_open,
+	.proc_read = seq_read,
+	.proc_lseek = seq_lseek,
+	.proc_release = single_release,
+	.proc_write = rtw_odm_proc_write,
+};
+#else
+static const struct file_operations rtw_odm_proc_seq_ops = {
+ 	.owner = THIS_MODULE,
+ 	.open = rtw_odm_proc_open,
+ 	.read = seq_read,
+@@ -2679,7 +2739,7 @@ static const struct file_operations rtw_
+ 	.write = rtw_odm_proc_write,
+ };
+ 
+-static const struct file_operations rtw_odm_proc_sseq_fops = {
+static const struct file_operations rtw_odm_proc_sseq_ops = {
+ 	.owner = THIS_MODULE,
+ 	.open = rtw_odm_proc_open,
+ 	.read = seq_read,
+@@ -2687,6 +2747,7 @@ static const struct file_operations rtw_
+ 	.release = single_release,
+ 	.write = rtw_odm_proc_write,
+ };
+#endif
+ 
+ struct proc_dir_entry *rtw_odm_proc_init(struct net_device *dev)
+ {
+@@ -2715,9 +2776,9 @@ struct proc_dir_entry *rtw_odm_proc_init
+ 
+ 	for (i = 0; i < odm_proc_hdls_num; i++) {
+ 		if (odm_proc_hdls[i].type == RTW_PROC_HDL_TYPE_SEQ)
+-			entry = rtw_proc_create_entry(odm_proc_hdls[i].name, dir_odm, &rtw_odm_proc_seq_fops, (void *)i);
+			entry = rtw_proc_create_entry(odm_proc_hdls[i].name, dir_odm, &rtw_odm_proc_seq_ops, (void *)i);
+ 		else if (odm_proc_hdls[i].type == RTW_PROC_HDL_TYPE_SSEQ)
+-			entry = rtw_proc_create_entry(odm_proc_hdls[i].name, dir_odm, &rtw_odm_proc_sseq_fops, (void *)i);
+			entry = rtw_proc_create_entry(odm_proc_hdls[i].name, dir_odm, &rtw_odm_proc_sseq_ops, (void *)i);
+ 		else
+ 			entry = NULL;
+ 
+@@ -2809,7 +2870,24 @@ static ssize_t rtw_mcc_proc_write(struct
+ 	return -EROFS;
+ }
+ 
+-static const struct file_operations rtw_mcc_proc_seq_fops = {
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0))
+static const struct proc_ops rtw_mcc_proc_seq_ops = {
+	.proc_open = rtw_mcc_proc_open,
+	.proc_read = seq_read,
+	.proc_lseek = seq_lseek,
+	.proc_release = seq_release,
+	.proc_write = rtw_mcc_proc_write,
+};
+
+static const struct file_operations rtw_mcc_proc_sseq_ops = {
+	.proc_open = rtw_mcc_proc_open,
+	.proc_read = seq_read,
+	.proc_lseek = seq_lseek,
+	.proc_release = single_release,
+	.proc_write = rtw_mcc_proc_write,
+};
+#else
+static const struct file_operations rtw_mcc_proc_seq_ops = {
+ 	.owner = THIS_MODULE,
+ 	.open = rtw_mcc_proc_open,
+ 	.read = seq_read,
+@@ -2818,7 +2896,7 @@ static const struct file_operations rtw_
+ 	.write = rtw_mcc_proc_write,
+ };
+ 
+-static const struct file_operations rtw_mcc_proc_sseq_fops = {
+static const struct file_operations rtw_mcc_proc_sseq_ops = {
+ 	.owner = THIS_MODULE,
+ 	.open = rtw_mcc_proc_open,
+ 	.read = seq_read,
+@@ -2826,6 +2904,7 @@ static const struct file_operations rtw_
+ 	.release = single_release,
+ 	.write = rtw_mcc_proc_write,
+ };
+#endif
+ 
+ struct proc_dir_entry *rtw_mcc_proc_init(struct net_device *dev)
+ {
+@@ -2854,9 +2933,9 @@ struct proc_dir_entry *rtw_mcc_proc_init
+ 
+ 	for (i = 0; i < mcc_proc_hdls_num; i++) {
+ 		if (mcc_proc_hdls[i].type == RTW_PROC_HDL_TYPE_SEQ)
+-			entry = rtw_proc_create_entry(mcc_proc_hdls[i].name, dir_mcc, &rtw_mcc_proc_seq_fops, (void *)i);
+			entry = rtw_proc_create_entry(mcc_proc_hdls[i].name, dir_mcc, &rtw_mcc_proc_seq_ops, (void *)i);
+ 		else if (mcc_proc_hdls[i].type == RTW_PROC_HDL_TYPE_SSEQ)
+-			entry = rtw_proc_create_entry(mcc_proc_hdls[i].name, dir_mcc, &rtw_mcc_proc_sseq_fops, (void *)i);
+			entry = rtw_proc_create_entry(mcc_proc_hdls[i].name, dir_mcc, &rtw_mcc_proc_sseq_ops, (void *)i);
+ 		else
+ 			entry = NULL;
+ 
+@@ -2920,9 +2999,9 @@ struct proc_dir_entry *rtw_adapter_proc_
+ 
+ 	for (i = 0; i < adapter_proc_hdls_num; i++) {
+ 		if (adapter_proc_hdls[i].type == RTW_PROC_HDL_TYPE_SEQ)
+-			entry = rtw_proc_create_entry(adapter_proc_hdls[i].name, dir_dev, &rtw_adapter_proc_seq_fops, (void *)i);
+			entry = rtw_proc_create_entry(adapter_proc_hdls[i].name, dir_dev, &rtw_adapter_proc_seq_ops, (void *)i);
+ 		else if (adapter_proc_hdls[i].type == RTW_PROC_HDL_TYPE_SSEQ)
+-			entry = rtw_proc_create_entry(adapter_proc_hdls[i].name, dir_dev, &rtw_adapter_proc_sseq_fops, (void *)i);
+			entry = rtw_proc_create_entry(adapter_proc_hdls[i].name, dir_dev, &rtw_adapter_proc_sseq_ops, (void *)i);
+ 		else
+ 			entry = NULL;
+ 
@@ -0,0 +1,16 @@
+--- linux/3rdparty/Kconfig.orig	2019-05-31 23:30:41.568375751 +0300
+++ linux/3rdparty/Kconfig	2019-05-31 23:33:39.796256889 +0300
+@@ -4,5 +4,6 @@ menu "External 3rdparty kernel additions"
+ 
+ source "3rdparty/ndiswrapper/Kconfig"
+ source "3rdparty/rtl8812au/Kconfig"
+source "3rdparty/rtl8723de/Kconfig"
+ 
+ endmenu
+--- linux/3rdparty/Makefile.orig	2019-05-31 23:33:17.610773901 +0300
+++ linux/3rdparty/Makefile	2019-05-31 23:33:57.608644657 +0300
+@@ -3,3 +3,4 @@
+ obj- := 3rdparty.o  # Dummy rule to force built-in.o to be made
+ obj-$(CONFIG_NDISWRAPPER) += ndiswrapper/
+ obj-$(CONFIG_RTL8812AU)   += rtl8812au/
+obj-$(CONFIG_RTL8723DE)   += rtl8723de/
@@ -0,0 +1,79 @@
+--- linux-5.8/3rdparty/rtl8723de/core/rtw_security.c
+++ linux-5.8/3rdparty/rtl8723de/core/rtw_security.c
+@@ -33,6 +33,14 @@ static const char *_security_type_str[] = {
+ 	"BIP",
+ };
+ 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
+struct sha256_state {
+        u64 length;
+        u32 state[8], curlen;
+        u8 buf[64];
+};
+#endif
+
+ const char *security_type_str(u8 value)
+ {
+ #ifdef CONFIG_IEEE80211W
+--- linux-5.8/3rdparty/rtl8723de/include/rtw_security.h
+++ linux-5.8/3rdparty/rtl8723de/include/rtw_security.h
+@@ -246,11 +246,13 @@ struct security_priv {
+ #endif /* DBG_SW_SEC_CNT */
+ };
+ 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0))
+ struct sha256_state {
+ 	u64 length;
+ 	u32 state[8], curlen;
+ 	u8 buf[64];
+ };
+#endif
+ 
+ #define GET_ENCRY_ALGO(psecuritypriv, psta, encry_algo, bmcst)\
+ 	do {\
+--- linux-5.8/3rdparty/rtl8723de/os_dep/linux/ioctl_cfg80211.c
+++ linux-5.8/3rdparty/rtl8723de/os_dep/linux/ioctl_cfg80211.c
+@@ -5857,10 +5857,18 @@ static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
+ #else
+ 	struct net_device *ndev,
+ #endif
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
+	struct mgmt_frame_regs *upd)
+#else
+ 	u16 frame_type, bool reg)
+#endif
+ {
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
+ 	struct net_device *ndev = wdev_to_ndev(wdev);
+#endif
+/* hardcoded always true, to make it pass compilation */
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
+        bool reg = true;
+ #endif
+ 	_adapter *adapter;
+ 
+@@ -5880,7 +5888,11 @@ static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
+ 	/* Wait QC Verify */
+ 	return;
+ 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
+        switch (upd->interface_stypes) {
+#else
+ 	switch (frame_type) {
+#endif
+ 	case IEEE80211_STYPE_PROBE_REQ: /* 0x0040 */
+ 		SET_CFG80211_REPORT_MGMT(pwdev_priv, IEEE80211_STYPE_PROBE_REQ, reg);
+ 		break;
+@@ -6846,7 +6858,11 @@ static struct cfg80211_ops rtw_cfg80211_ops = {
+ 
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
+ 	.mgmt_tx = cfg80211_rtw_mgmt_tx,
+-	.mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
+	.update_mgmt_frame_registrations = cfg80211_rtw_mgmt_frame_register,
+#else
+    .mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,
+#endif
+ #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
+ 	.action = cfg80211_rtw_mgmt_tx,
+ #endif
@@ -0,0 +1,13 @@
+--- linux/3rdparty/rtl8723de/include/wifi.h.orig	2019-01-19 16:29:26.302342688 +0200
+++ linux/3rdparty/rtl8723de/include/wifi.h	2019-01-19 16:32:25.543905828 +0200
+@@ -1003,8 +1003,9 @@ typedef enum _HT_CAP_AMPDU_DENSITY {
+  * According to IEEE802.11n spec size varies from 8K to 64K (in powers of 2)
+  */
+ #define IEEE80211_MIN_AMPDU_BUF 0x8
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0))
+ #define IEEE80211_MAX_AMPDU_BUF 0x40
+-
+#endif
+ 
+ /* Spatial Multiplexing Power Save Modes */
+ #define WLAN_HT_CAP_SM_PS_STATIC		0
@@ -0,0 +1,11 @@
+--- ./3rdparty/rtl8723de/Makefile.orig	2019-10-08 13:51:56.729205790 +0300
+++ ./3rdparty/rtl8723de/Makefile	2019-10-08 14:03:32.894164296 +0300
+@@ -74,7 +74,7 @@ CONFIG_APPEND_VENDOR_IE_ENABLE = n
+ CONFIG_RTW_NAPI = y
+ CONFIG_RTW_GRO = y
+ ########################## Debug ###########################
+-CONFIG_RTW_DEBUG = y
+CONFIG_RTW_DEBUG = n
+ # default log level is _DRV_INFO_ = 4,
+ # please refer to "How_to_set_driver_debug_log_level.doc" to set the available level.
+ CONFIG_RTW_LOG_LEVEL = 4
@@ -0,0 +1,16 @@
+--- linux/3rdparty/Kconfig.orig	2019-05-31 23:26:48.844304457 +0300
+++ linux/3rdparty/Kconfig	2019-05-31 23:30:41.568375751 +0300
+@@ -3,5 +3,6 @@
+ menu "External 3rdparty kernel additions"
+ 
+ source "3rdparty/ndiswrapper/Kconfig"
+source "3rdparty/rtl8812au/Kconfig"
+ 
+ endmenu
+--- linux/3rdparty/Makefile.orig	2019-05-31 23:27:35.405319287 +0300
+++ linux/3rdparty/Makefile	2019-05-31 23:30:56.855708733 +0300
+@@ -2,3 +2,4 @@
+ 
+ obj- := 3rdparty.o  # Dummy rule to force built-in.o to be made
+ obj-$(CONFIG_NDISWRAPPER) += ndiswrapper/
+obj-$(CONFIG_RTL8812AU)   += rtl8812au/
@@ -0,0 +1,281 @@
+From ee9619ba0c8840db6d59d11989c31e24a8f0d806 Mon Sep 17 00:00:00 2001
+From: Carlos <CGarces@users.noreply.github.com>
+Date: Sun, 8 Nov 2020 12:25:43 +0000
+Subject: [PATCH] Fix kernel 5.10-rc1
+
+---
+ 3rdparty/rtl8812au/core/rtw_btcoex.c       |  7 ++++++-
+ 3rdparty/rtl8812au/core/rtw_wlan_util.c    | 10 ++++++----
+ 3rdparty/rtl8812au/os_dep/linux/os_intfs.c | 19 +++++++++++++-----
+ 3rdparty/rtl8812au/os_dep/osdep_service.c  | 43 +++++++++++++++++++++++++++--------------
+ 4 files changed, 54 insertions(+), 25 deletions(-)
+
+diff --git a/3rdparty/rtl8812au/core/rtw_btcoex.c b/3rdparty/rtl8812au/core/rtw_btcoex.c
+index d5b89bdc..f5e0f567 100644
+--- a/3rdparty/rtl8812au/core/rtw_btcoex.c
+++ b/3rdparty/rtl8812au/core/rtw_btcoex.c
+@@ -1443,7 +1443,9 @@ u8 rtw_btcoex_sendmsgbysocket(_adapter *padapter, u8 *msg, u8 msg_size, bool for
+ {
+ 	u8 error;
+ 	struct msghdr	udpmsg;
+#ifdef set_fs
+ 	mm_segment_t	oldfs;
+#endif
+ 	struct iovec	iov;
+ 	struct bt_coex_info *pcoex_info = &padapter->coex_info;
+ 
+@@ -1473,15 +1475,18 @@ u8 rtw_btcoex_sendmsgbysocket(_adapter *padapter, u8 *msg, u8 msg_size, bool for
+ 	udpmsg.msg_control	= NULL;
+ 	udpmsg.msg_controllen = 0;
+ 	udpmsg.msg_flags	= MSG_DONTWAIT | MSG_NOSIGNAL;
+#ifdef set_fs
+ 	oldfs = get_fs();
+ 	set_fs(KERNEL_DS);
+-
+#endif
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0))
+ 	error = sock_sendmsg(pcoex_info->udpsock, &udpmsg);
+ #else
+ 	error = sock_sendmsg(pcoex_info->udpsock, &udpmsg, msg_size);
+ #endif
+#ifdef set_fs
+ 	set_fs(oldfs);
+#endif
+ 	if (error < 0) {
+ 		RTW_INFO("Error when sendimg msg, error:%d\n", error);
+ 		return _FAIL;
+diff --git a/3rdparty/rtl8812au/core/rtw_wlan_util.c b/3rdparty/rtl8812au/core/rtw_wlan_util.c
+index b4cecd11..e465e9b5 100644
+--- a/3rdparty/rtl8812au/core/rtw_wlan_util.c
+++ b/3rdparty/rtl8812au/core/rtw_wlan_util.c
+@@ -4744,7 +4744,9 @@ int rtw_dev_nlo_info_set(struct pno_nlo_info *nlo_info, pno_ssid_t *ssid,
+ 
+ 	int i = 0;
+ 	struct file *fp;
+#ifdef set_fs
+ 	mm_segment_t fs;
+#endif
+ 	loff_t pos = 0;
+ 	u8 *source = NULL;
+ 	long len = 0;
+@@ -4780,10 +4782,10 @@ int rtw_dev_nlo_info_set(struct pno_nlo_info *nlo_info, pno_ssid_t *ssid,
+ 		RTW_INFO("Error, cipher array using default value.\n");
+ 		return 0;
+ 	}
+-
+#ifdef set_fs
+ 	fs = get_fs();
+ 	set_fs(KERNEL_DS);
+-
+#endif
+ 	source = rtw_zmalloc(2048);
+ 
+ 	if (source != NULL) {
+@@ -4791,10 +4793,10 @@ int rtw_dev_nlo_info_set(struct pno_nlo_info *nlo_info, pno_ssid_t *ssid,
+ 		rtw_parse_cipher_list(nlo_info, source);
+ 		rtw_mfree(source, 2048);
+ 	}
+-
+#ifdef set_fs
+ 	set_fs(fs);
+ 	filp_close(fp, NULL);
+-
+#endif
+ 	RTW_INFO("-%s-\n", __func__);
+ 	return 0;
+ }
+diff --git a/3rdparty/rtl8812au/os_dep/linux/os_intfs.c b/3rdparty/rtl8812au/os_dep/linux/os_intfs.c
+index 1085d6cd..a37e488b 100644
+--- a/3rdparty/rtl8812au/os_dep/linux/os_intfs.c
+++ b/3rdparty/rtl8812au/os_dep/linux/os_intfs.c
+@@ -4029,7 +4029,9 @@ static int route_dump(u32 *gw_addr , int *gw_index)
+ 	struct msghdr msg;
+ 	struct iovec iov;
+ 	struct sockaddr_nl nladdr;
+#ifdef set_fs
+ 	mm_segment_t oldfs;
+#endif
+ 	char *pg;
+ 	int size = 0;
+ 
+@@ -4067,16 +4069,18 @@ static int route_dump(u32 *gw_addr , int *gw_index)
+ 	msg.msg_control = NULL;
+ 	msg.msg_controllen = 0;
+ 	msg.msg_flags = MSG_DONTWAIT;
+-
+#ifdef set_fs
+ 	oldfs = get_fs();
+ 	set_fs(KERNEL_DS);
+#endif
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0))
+ 	err = sock_sendmsg(sock, &msg);
+ #else
+ 	err = sock_sendmsg(sock, &msg, sizeof(req));
+ #endif
+#ifdef set_fs
+ 	set_fs(oldfs);
+-
+#endif
+ 	if (err < 0)
+ 		goto out_sock;
+ 
+@@ -4099,16 +4103,18 @@ static int route_dump(u32 *gw_addr , int *gw_index)
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0))
+ 		iov_iter_init(&msg.msg_iter, READ, &iov, 1, PAGE_SIZE);
+ #endif
+-
+#ifdef set_fs
+ 		oldfs = get_fs();
+ 		set_fs(KERNEL_DS);
+#endif
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0))
+ 		err = sock_recvmsg(sock, &msg, MSG_DONTWAIT);
+ #else
+ 		err = sock_recvmsg(sock, &msg, PAGE_SIZE, MSG_DONTWAIT);
+ #endif
+#ifdef set_fs
+ 		set_fs(oldfs);
+-
+#endif
+ 		if (err < 0)
+ 			goto out_sock_pg;
+ 
+@@ -4178,15 +4184,18 @@ static int route_dump(u32 *gw_addr , int *gw_index)
+ 		msg.msg_controllen = 0;
+ 		msg.msg_flags = MSG_DONTWAIT;
+ 
+#ifdef set_fs
+ 		oldfs = get_fs();
+ 		set_fs(KERNEL_DS);
+#endif
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0))
+ 		err = sock_sendmsg(sock, &msg);
+ #else
+ 		err = sock_sendmsg(sock, &msg, sizeof(req));
+ #endif
+#ifdef set_fs
+ 		set_fs(oldfs);
+-
+#endif
+ 		if (err > 0)
+ 			goto restart;
+ 	}
+diff --git a/3rdparty/rtl8812au/os_dep/osdep_service.c b/3rdparty/rtl8812au/os_dep/osdep_service.c
+index 7c6d1208..0769b49d 100644
+--- a/3rdparty/rtl8812au/os_dep/osdep_service.c
+++ b/3rdparty/rtl8812au/os_dep/osdep_service.c
+@@ -2164,11 +2164,21 @@ static int writeFile(struct file *fp, char *buf, int len)
+ {
+ 	int wlen = 0, sum = 0;
+ 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0))
+	if (!(fp->f_mode & FMODE_CAN_WRITE))
+#else
+ 	if (!fp->f_op || !fp->f_op->write)
+#endif
+ 		return -EPERM;
+ 
+ 	while (sum < len) {
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0))
+		wlen = kernel_write(fp, buf + sum, len - sum, &fp->f_pos);
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0))
+		wlen = __vfs_write(fp, buf + sum, len - sum, &fp->f_pos);
+#else
+ 		wlen = fp->f_op->write(fp, buf + sum, len - sum, &fp->f_pos);
+#endif
+ 		if (wlen > 0)
+ 			sum += wlen;
+ 		else if (0 != wlen)
+@@ -2191,19 +2201,19 @@ 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();
+-		#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0))
+ 		set_fs(KERNEL_DS);
+-		#else
+-		set_fs(get_ds());
+-		#endif
+#endif
+ 
+ 		if (1 != readFile(fp, &buf, 1))
+ 			ret = PTR_ERR(fp);
+@@ -2215,8 +2225,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;
+@@ -2232,22 +2243,23 @@ 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();
+-			#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);
+#else
+			ret = readFile(fp, buf, sz);
+#endif
+ 			closeFile(fp);
+ 
+ 			RTW_INFO("%s readFile, ret:%d\n", __FUNCTION__, ret);
+@@ -2271,22 +2283,23 @@ static int retriveFromFile(const char *path, u8 *buf, u32 sz)
+ static int storeToFile(const char *path, u8 *buf, u32 sz)
+ {
+ 	int ret = 0;
+#ifdef set_fs
+ 	mm_segment_t oldfs;
+#endif
+ 	struct file *fp;
+ 
+ 	if (path && buf) {
+ 		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();
+-			#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);
+#else
+			ret = writeFile(fp, buf, sz);
+#endif
+ 			closeFile(fp);
+ 
+ 			RTW_INFO("%s writeFile, ret:%d\n", __FUNCTION__, ret);
@@ -0,0 +1,78 @@
+
+Adjust driver bits so it keeps the name of the replaced driver
+
+Signed-off-by: Thomas Backlund <tmb@mageia.org>
+
+---
+ 3rdparty/rtl8812au/Kconfig                       |    6 +++---
+ 3rdparty/rtl8812au/Makefile                      |    8 ++++----
+ 3rdparty/rtl8812au/hal/hal_com.c                 |    2 +-
+ 3rdparty/rtl8812au/os_dep/linux/ioctl_cfg80211.c |    2 +-
+ 4 files changed, 9 insertions(+), 9 deletions(-)
+
+diff -Nurp linux-5.5/3rdparty/rtl8812au.orig/hal/hal_com.c linux-5.5/3rdparty/rtl8812au/hal/hal_com.c
+--- linux-5.5/3rdparty/rtl8812au.orig/hal/hal_com.c	2020-03-09 01:46:04.750166543 +0200
+++ linux-5.5/3rdparty/rtl8812au/hal/hal_com.c	2020-03-11 18:23:33.839805026 +0200
+@@ -12879,7 +12879,7 @@ bypass_hw_pg:
+ 	_rtw_memset(hal_data->EEPROMMACAddr, 0, ETH_ALEN);
+ 	ret = _FAIL;
+ exit:
+-	dev_info(&udev->dev, "88XXau %pM hw_info[%02x]", hw_addr, addr_offset);
+	dev_info(&udev->dev, "8812au %pM hw_info[%02x]", hw_addr, addr_offset);
+ 	return ret;
+ }
+ 
+diff -Nurp linux-5.5/3rdparty/rtl8812au.orig/Kconfig linux-5.5/3rdparty/rtl8812au/Kconfig
+--- linux-5.5/3rdparty/rtl8812au.orig/Kconfig	2020-03-09 01:46:04.682163430 +0200
+++ linux-5.5/3rdparty/rtl8812au/Kconfig	2020-03-11 18:21:33.457357175 +0200
+@@ -1,6 +1,6 @@
+-config 88XXAU
+-	tristate "Realtek 88XXau USB WiFi"
+config RTL8812AU
+	tristate "Realtek 8812au USB WiFi"
+ 	depends on USB
+ 	---help---
+-	  Help message of 88XXau
+	  Help message of 8812au
+ 
+diff -Nurp linux-5.5/3rdparty/rtl8812au.orig/Makefile linux-5.5/3rdparty/rtl8812au/Makefile
+--- linux-5.5/3rdparty/rtl8812au.orig/Makefile	2020-03-09 01:46:04.682163430 +0200
+++ linux-5.5/3rdparty/rtl8812au/Makefile	2020-03-11 18:22:16.769317077 +0200
+@@ -179,9 +179,9 @@ endif
+ 
+ ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A)_$(CONFIG_RTL8814A), y_y_y)
+ 
+-EXTRA_CFLAGS += -DDRV_NAME=\"rtl88XXau\"
+EXTRA_CFLAGS += -DDRV_NAME=\"rtl8812au\"
+ ifeq ($(CONFIG_USB_HCI), y)
+-USER_MODULE_NAME = 88XXau
+USER_MODULE_NAME = 8812au
+ endif
+ else
+ EXTRA_CFLAGS += -DDRV_NAME=\"rtl8812au\"
+@@ -2233,11 +2233,11 @@ $(MODULE_NAME)-y += $(_PLATFORM_FILES)
+ 
+ $(MODULE_NAME)-$(CONFIG_MP_INCLUDED) += core/rtw_mp.o
+ 
+-obj-$(CONFIG_88XXAU) := $(MODULE_NAME).o
+obj-$(CONFIG_RTL8812AU) := $(MODULE_NAME).o
+ 
+ else
+ 
+-export CONFIG_88XXAU = m
+export CONFIG_RTL8812AU = m
+ 
+ all: modules
+ 
+diff -Nurp linux-5.5/3rdparty/rtl8812au.orig/os_dep/linux/ioctl_cfg80211.c linux-5.5/3rdparty/rtl8812au/os_dep/linux/ioctl_cfg80211.c
+--- linux-5.5/3rdparty/rtl8812au.orig/os_dep/linux/ioctl_cfg80211.c	2020-03-09 01:46:04.798168741 +0200
+++ linux-5.5/3rdparty/rtl8812au/os_dep/linux/ioctl_cfg80211.c	2020-03-11 18:24:09.196405329 +0200
+@@ -2639,7 +2639,7 @@ void rtw_cfg80211_unlink_bss(_adapter *p
+ #endif
+ 
+ 	if (!wiphy) {
+-		pr_info("88XXAU: rtw_cfg80211_unlink_bss: wiphy is NULL\n");
+		pr_info("8812AU: rtw_cfg80211_unlink_bss: wiphy is NULL\n");
+ 		return;
+ 	}
+ 
@@ -0,0 +1,301 @@
+diff -up linux-5.8/3rdparty/rtl8821ce/core/rtw_security.c.kernel58 linux-5.8/3rdparty/rtl8821ce/core/rtw_security.c
+--- linux-5.8/3rdparty/rtl8821ce/core/rtw_security.c.kernel58	2020-08-12 18:12:12.492276511 +0200
+++ linux-5.8/3rdparty/rtl8821ce/core/rtw_security.c	2020-08-12 18:13:07.202678858 +0200
+@@ -2133,7 +2133,7 @@ BIP_exit:
+ #ifndef PLATFORM_FREEBSD
+ #if defined(CONFIG_TDLS)
+ /* compress 512-bits */
+-static int sha256_compress(struct _sha256_state *md, unsigned char *buf)
+static int sha256_compress(struct sha256_state *md, unsigned char *buf)
+ {
+ 	u32 S[8], W[64], t0, t1;
+ 	u32 t;
+@@ -2181,7 +2181,7 @@ static int sha256_compress(struct _sha25
+ }
+ 
+ /* Initialize the hash state */
+-static void sha256_init(struct _sha256_state *md)
+static void sha256_init(struct sha256_state *md)
+ {
+ 	md->curlen = 0;
+ 	md->length = 0;
+@@ -2202,7 +2202,7 @@ static void sha256_init(struct _sha256_s
+    @param inlen  The length of the data (octets)
+    @return CRYPT_OK if successful
+ */
+-static int sha256_process(struct _sha256_state *md, unsigned char *in,
+static int sha256_process(struct sha256_state *md, unsigned char *in,
+ 			  unsigned long inlen)
+ {
+ 	unsigned long n;
+@@ -2243,7 +2243,7 @@ static int sha256_process(struct _sha256
+    @param out [out] The destination of the hash (32 bytes)
+    @return CRYPT_OK if successful
+ */
+-static int sha256_done(struct _sha256_state *md, unsigned char *out)
+static int sha256_done(struct sha256_state *md, unsigned char *out)
+ {
+ 	int i;
+ 
+@@ -2293,7 +2293,7 @@ static int sha256_done(struct _sha256_st
+ static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
+ 			 u8 *mac)
+ {
+-	struct _sha256_state ctx;
+	struct sha256_state ctx;
+ 	size_t i;
+ 
+ 	sha256_init(&ctx);
+diff -up linux-5.8/3rdparty/rtl8821ce/include/rtw_security.h.kernel58 linux-5.8/3rdparty/rtl8821ce/include/rtw_security.h
+--- linux-5.8/3rdparty/rtl8821ce/include/rtw_security.h.kernel58	2020-08-12 18:12:12.860279218 +0200
+++ linux-5.8/3rdparty/rtl8821ce/include/rtw_security.h	2020-08-12 18:13:07.202678858 +0200
+@@ -249,11 +249,13 @@ struct security_priv {
+ #define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
+ #endif
+ 
+-struct _sha256_state {
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0))
+struct sha256_state {
+ 	u64 length;
+ 	u32 state[8], curlen;
+ 	u8 buf[64];
+ };
+#endif
+ 
+ #define GET_ENCRY_ALGO(psecuritypriv, psta, encry_algo, bmcst)\
+ 	do {\
+diff -up linux-5.8/3rdparty/rtl8821ce/os_dep/linux/ioctl_cfg80211.c.kernel58 linux-5.8/3rdparty/rtl8821ce/os_dep/linux/ioctl_cfg80211.c
+--- linux-5.8/3rdparty/rtl8821ce/os_dep/linux/ioctl_cfg80211.c.kernel58	2020-08-12 18:12:12.867279269 +0200
+++ linux-5.8/3rdparty/rtl8821ce/os_dep/linux/ioctl_cfg80211.c	2020-08-12 18:13:07.204678873 +0200
+@@ -80,7 +80,7 @@
+ #endif
+ 
+ /*
+- * In the current design of Wi-Fi driver, it will return success to the system (e.g. supplicant) 
+ * In the current design of Wi-Fi driver, it will return success to the system (e.g. supplicant)
+  * when Wi-Fi driver decides to abort the scan request in the scan flow by default.
+  * Defining this flag makes Wi-Fi driver to return -EBUSY to the system if Wi-Fi driver is too busy to do the scan.
+  */
+@@ -321,7 +321,7 @@ static u8 rtw_chbw_to_cfg80211_chan_def(
+ 	if (!chan)
+ 		goto exit;
+ 
+-	if (bw == CHANNEL_WIDTH_20) 
+	if (bw == CHANNEL_WIDTH_20)
+ 		chdef->width = ht ? NL80211_CHAN_WIDTH_20 : NL80211_CHAN_WIDTH_20_NOHT;
+ 	else if (bw == CHANNEL_WIDTH_40)
+ 		chdef->width = NL80211_CHAN_WIDTH_40;
+@@ -355,7 +355,7 @@ static void rtw_get_chbw_from_cfg80211_c
+ 		rtw_warn_on(1);
+ 		*ch = 0;
+ 		return;
+-	}		
+	}
+ 
+ 	switch (chdef->width) {
+ 	case NL80211_CHAN_WIDTH_20_NOHT:
+@@ -1577,8 +1577,8 @@ static int rtw_cfg80211_set_encryption(s
+ 						_rtw_memcpy(padapter->securitypriv.dot118021XGrptxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[16]), 8);
+ 						_rtw_memcpy(padapter->securitypriv.dot118021XGrprxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[24]), 8);
+ 						padapter->securitypriv.binstallGrpkey = _TRUE;
+-						if (param->u.crypt.idx < 4) 
+-							_rtw_memcpy(padapter->securitypriv.iv_seq[param->u.crypt.idx], param->u.crypt.seq, 8);							
+						if (param->u.crypt.idx < 4)
+							_rtw_memcpy(padapter->securitypriv.iv_seq[param->u.crypt.idx], param->u.crypt.seq, 8);
+ 						padapter->securitypriv.dot118021XGrpKeyid = param->u.crypt.idx;
+ 						rtw_set_key(padapter, &padapter->securitypriv, param->u.crypt.idx, 1, _TRUE);
+ 
+@@ -1826,7 +1826,7 @@ static int cfg80211_rtw_get_key(struct w
+ 		#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
+ 		|| (MLME_IS_STA(adapter) && !pairwise)
+ 		#endif
+-	) {	
+	) {
+ 		/* WEP key, TX GTK/IGTK, RX GTK/IGTK(for STA mode) */
+ 		if (is_wep_enc(sec->dot118021XGrpPrivacy)) {
+ 			if (keyid >= WEP_KEYS)
+@@ -1915,7 +1915,7 @@ static int cfg80211_rtw_get_key(struct w
+ 	}
+ 
+ 	ret = 0;
+-	
+
+ exit:
+ 	RTW_INFO(FUNC_NDEV_FMT
+ 		GET_KEY_PARAM_FMT_S
+@@ -5565,7 +5565,7 @@ release_plink_ctl:
+ 		if (del_sta) {
+ 			u8 sta_addr[ETH_ALEN];
+ 			u8 updated = _FALSE;
+-			
+
+ 			_rtw_memcpy(sta_addr, del_sta->cmn.mac_addr, ETH_ALEN);
+ 			updated = ap_free_sta(adapter, del_sta, 0, 0, 1);
+ 			rtw_mesh_expire_peer(stapriv->padapter, sta_addr);
+@@ -5650,7 +5650,7 @@ static int	cfg80211_rtw_dump_station(str
+ 	else
+ 		_rtw_memcpy(mac, plink->addr, ETH_ALEN);
+ 	#endif
+-	
+
+ 	sinfo->filled = 0;
+ 
+ 	if (psta) {
+@@ -7307,11 +7307,22 @@ static void cfg80211_rtw_mgmt_frame_regi
+ #else
+ 	struct net_device *ndev,
+ #endif
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
+	struct mgmt_frame_regs *upd)
+#else
+ 	u16 frame_type, bool reg)
+#endif
+
+ {
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
+ 	struct net_device *ndev = wdev_to_ndev(wdev);
+ #endif
+
+/* hardcoded always true, to make it pass compilation */
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
+	bool reg = true;
+#endif
+
+ 	_adapter *adapter;
+ 
+ 	struct rtw_wdev_priv *pwdev_priv;
+@@ -7330,7 +7341,12 @@ static void cfg80211_rtw_mgmt_frame_regi
+ 	/* Wait QC Verify */
+ 	return;
+ 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
+	switch (upd->interface_stypes) {
+#else
+ 	switch (frame_type) {
+#endif
+
+ 	case IEEE80211_STYPE_PROBE_REQ: /* 0x0040 */
+ 		SET_CFG80211_REPORT_MGMT(pwdev_priv, IEEE80211_STYPE_PROBE_REQ, reg);
+ 		break;
+@@ -7682,7 +7698,7 @@ void dump_mesh_config(void *sel, const s
+ 	RTW_PRINT_SEL(sel, "path_refresh_time:%u\n", conf->path_refresh_time);
+ 	RTW_PRINT_SEL(sel, "min_discovery_timeout:%u\n", conf->min_discovery_timeout);
+ 	RTW_PRINT_SEL(sel, "dot11MeshHWMPactivePathTimeout:%u\n", conf->dot11MeshHWMPactivePathTimeout);
+-	RTW_PRINT_SEL(sel, "dot11MeshHWMPpreqMinInterval:%u\n", conf->dot11MeshHWMPpreqMinInterval);	
+	RTW_PRINT_SEL(sel, "dot11MeshHWMPpreqMinInterval:%u\n", conf->dot11MeshHWMPpreqMinInterval);
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0))
+ 	RTW_PRINT_SEL(sel, "dot11MeshHWMPperrMinInterval:%u\n", conf->dot11MeshHWMPperrMinInterval);
+ #endif
+@@ -7697,11 +7713,11 @@ void dump_mesh_config(void *sel, const s
+ 	RTW_PRINT_SEL(sel, "dot11MeshForwarding:%d\n", conf->dot11MeshForwarding);
+ 	RTW_PRINT_SEL(sel, "rssi_threshold:%d\n", conf->rssi_threshold);
+ #endif
+-	
+
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0))
+ 	RTW_PRINT_SEL(sel, "ht_opmode:0x%04x\n", conf->ht_opmode);
+ #endif
+-	
+
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
+ 	RTW_PRINT_SEL(sel, "dot11MeshHWMPactivePathToRootTimeout:%u\n", conf->dot11MeshHWMPactivePathToRootTimeout);
+ 	RTW_PRINT_SEL(sel, "dot11MeshHWMProotInterval:%u\n", conf->dot11MeshHWMProotInterval);
+@@ -7712,7 +7728,7 @@ void dump_mesh_config(void *sel, const s
+ 	RTW_PRINT_SEL(sel, "power_mode:%s\n", nl80211_mesh_power_mode_str(conf->power_mode));
+ 	RTW_PRINT_SEL(sel, "dot11MeshAwakeWindowDuration:%u\n", conf->dot11MeshAwakeWindowDuration);
+ #endif
+-	
+
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0))
+ 	RTW_PRINT_SEL(sel, "plink_timeout:%u\n", conf->plink_timeout);
+ #endif
+@@ -7848,14 +7864,14 @@ static void rtw_cfg80211_mesh_cfg_set(_a
+ 	if (chk_mesh_attr(NL80211_MESHCONF_HT_OPMODE, mask));
+ #endif
+ #endif
+-	
+
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
+ 	if (chk_mesh_attr(NL80211_MESHCONF_HWMP_PATH_TO_ROOT_TIMEOUT, mask))
+ 		mcfg->dot11MeshHWMPactivePathToRootTimeout = conf->dot11MeshHWMPactivePathToRootTimeout;
+ 	if (chk_mesh_attr(NL80211_MESHCONF_HWMP_ROOT_INTERVAL, mask))
+ 		mcfg->dot11MeshHWMProotInterval = conf->dot11MeshHWMProotInterval;
+ 	if (chk_mesh_attr(NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL, mask))
+-		mcfg->dot11MeshHWMPconfirmationInterval = conf->dot11MeshHWMPconfirmationInterval;	
+		mcfg->dot11MeshHWMPconfirmationInterval = conf->dot11MeshHWMPconfirmationInterval;
+ #endif
+ 
+ #if 0 /* TBD */
+@@ -7913,7 +7929,7 @@ u8 *rtw_cfg80211_construct_mesh_beacon_i
+ #endif
+ 	if (!ch)
+ 		goto exit;
+-	
+
+ #if defined(CONFIG_80211AC_VHT) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
+ 	vht = ht && ch > 14 && bw >= CHANNEL_WIDTH_80; /* VHT40/VHT20? */
+ #endif
+@@ -8244,7 +8260,7 @@ static int cfg80211_rtw_join_mesh(struct
+ 		ret = -EINVAL;
+ 		goto exit;
+ 	}
+-	
+
+ 	rtw_mesh_work(&adapter->mesh_work);
+ 
+ exit:
+@@ -8325,7 +8341,7 @@ static int cfg80211_rtw_del_mpath(struct
+ 		}
+ 	} else {
+ 		rtw_mesh_path_flush_by_iface(adapter);
+-	}	
+	}
+ 
+ exit:
+ 	return ret;
+@@ -8626,13 +8642,13 @@ int	cfg80211_rtw_resume(struct wiphy *wi
+ 		//rtw_sitesurvey_cmd(padapter, NULL);
+ 		rtw_sitesurvey_cmd(padapter, &parm);
+ 		_exit_critical_bh(&pmlmepriv->lock, &irqL);
+-		
+
+ 		for (PNOWakeupScanWaitCnt = 0; PNOWakeupScanWaitCnt < 10; PNOWakeupScanWaitCnt++) {
+ 			if(check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _FALSE)
+ 				break;
+ 			rtw_msleep_os(1000);
+ 		}
+-		
+
+ 		_enter_critical_bh(&pmlmepriv->lock, &irqL);
+ 		cfg80211_sched_scan_results(padapter->rtw_wdev->wiphy);
+ 		_exit_critical_bh(&pmlmepriv->lock, &irqL);
+@@ -8640,7 +8656,7 @@ int	cfg80211_rtw_resume(struct wiphy *wi
+ 	}
+ 	RTW_DBG("<== %s\n",__func__);
+ 	return 0;
+-	
+
+ }
+ #endif /* CONFIG_PNO_SUPPORT */
+ 
+@@ -9530,7 +9546,7 @@ int rtw_hostapd_acs_dump_survey(struct w
+ #elif defined(CONFIG_RTW_ACS) && defined(CONFIG_BACKGROUND_NOISE_MONITOR)
+ 	rtw_cfg80211_set_survey_info_with_clm(padapter, idx, info);
+ #else
+-	RTW_ERR("%s: unknown acs operation!\n", __func__); 
+	RTW_ERR("%s: unknown acs operation!\n", __func__);
+ #endif
+ 
+ 	return ret;
+@@ -9631,7 +9647,11 @@ static struct cfg80211_ops rtw_cfg80211_
+ 
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
+ 	.mgmt_tx = cfg80211_rtw_mgmt_tx,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
+	.update_mgmt_frame_registrations = cfg80211_rtw_mgmt_frame_register,
+#else
+ 	.mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,
+#endif
+ #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
+ 	.action = cfg80211_rtw_mgmt_tx,
+ #endif
@@ -0,0 +1,20 @@
+--- linux-5.3.orig/3rdparty/Kconfig
+++ linux-5.3/3rdparty/Kconfig
+@@ -3,6 +3,7 @@
+ menu "External 3rdparty kernel additions"
+ 
+ source "3rdparty/ndiswrapper/Kconfig"
+source "3rdparty/rtl8821ce/Kconfig"
+ source "3rdparty/rtl8812au/Kconfig"
+ source "3rdparty/rtl8723de/Kconfig"
+ source "3rdparty/viahss/Kconfig"
+--- linux-5.3.orig/3rdparty/Makefile
+++ linux-5.3/3rdparty/Makefile
+@@ -2,6 +2,7 @@
+ 
+ obj- := 3rdparty.o  # Dummy rule to force built-in.o to be made
+ obj-$(CONFIG_NDISWRAPPER) += ndiswrapper/
+obj-$(CONFIG_RTL8821CE)   += rtl8821ce/
+ obj-$(CONFIG_RTL8812AU)   += rtl8812au/
+ obj-$(CONFIG_RTL8723DE)   += rtl8723de/
+ obj-$(CONFIG_VIAHSS)      += viahss/
@@ -0,0 +1,189 @@
+ 3rdparty/viahss/Kconfig     |   14 +++++++
+ 3rdparty/viahss/Makefile    |    3 +
+ 3rdparty/viahss/README.html |   68 ++++++++++++++++++++++++++++++++++++
+ 3rdparty/viahss/viahss.c    |   83 ++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 168 insertions(+)
+diff -Nurp linux-2.6.37/3rdparty/viahss/Kconfig linux-2.6.37.3rdparty/3rdparty/viahss/Kconfig
+--- linux-2.6.37/3rdparty/viahss/Kconfig	1970-01-01 02:00:00.000000000 +0200
+++ linux-2.6.37.3rdparty/3rdparty/viahss/Kconfig	2003-12-01 01:53:51.000000000 +0200
+@@ -0,0 +1,14 @@
+config VIAHSS
+	tristate "VIA High Speed Serial"
+	depends on SERIAL_CORE && m
+	---help---
+	  VIA High Speed Serial is a little kernel module (1 KB) which enables
+	  high speed serial port modes of VIA VT82C686A or VT82C686B
+	  southbridge-equipped motherboards. With this module, you can use the
+	  serial port at 230400 bit/s so that you can get the full 128000 bit/s
+	  from ISDN-TA. The module has been tested with both 686A and 686B
+	  chipsets.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called viahss.
+
+diff -Nurp linux-2.6.37/3rdparty/viahss/Makefile linux-2.6.37.3rdparty/3rdparty/viahss/Makefile
+--- linux-2.6.37/3rdparty/viahss/Makefile	1970-01-01 02:00:00.000000000 +0200
+++ linux-2.6.37.3rdparty/3rdparty/viahss/Makefile	2003-12-01 01:43:23.000000000 +0200
+@@ -0,0 +1,3 @@
+
+obj-$(CONFIG_VIAHSS) += viahss.o
+    
+diff -Nurp linux-2.6.37/3rdparty/viahss/README.html linux-2.6.37.3rdparty/3rdparty/viahss/README.html
+--- linux-2.6.37/3rdparty/viahss/README.html	1970-01-01 02:00:00.000000000 +0200
+++ linux-2.6.37.3rdparty/3rdparty/viahss/README.html	2003-12-01 01:58:23.000000000 +0200
+@@ -0,0 +1,68 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+  <title>High speed serial port for VIA VT82C686 chipsets for linux</title>
+</head>
+<body>
+<H3>Setting the serial port speed over 115,200bps</H3>
+<br>
+If you have motherboard which has VIA VT82C686A or VT82C686B chipset 
+you can set serial ports in high speed mode with this kernel module. 
+I use module with external ISDN-TA and haven't had any problems 
+so far but I cannot guarantee that you won't have buffer overflows if 
+you use full 230K or 460K speed all the time (FIFO's are still 16550A size). 
+ISDN with two channels maxes out at 128 Kb which means that it doesn't
+really stress serial ports at 230400. Unlike SHSMOD-patches you don't have 
+to patch serial driver and module takes only 1KB of memory when it's 
+loaded which should leave enough room for other programs. It should
+be also possible to make this work from userspace but accessing
+pci devices is so much easier from kernel. 
+
+<H3>How to use module</H3>
+Get the <A href=http://www.kati.fi/viahss/viahss-0.92.tar.gz>package</A> 
+and compile it using included makefiles. 
+<H3>For 2.4</H3>
+If you have kernel in some other location than /usr/src/linux edit Makefile 
+before compiling.  You can also install module with "make install".  After 
+you have loaded module in kernel (use modprobe or insmod) you can set serial 
+ports to use high speed modes with setserial.<br>
+<H3>For 2.5/2.6</H3>
+Copy Makefile-2.6 on top of Makefile and do make. After loading module set
+serial speed with setserial. (NOTE: This gives a warning on depracated
+method). 
+
+<br>
+# setserial /dev/ttyS0 spd_cust divisor 0x8002
+<br><br>
+which sets COM1: speed to 230400. With 0x8001 you should get 460800
+but I haven't tested it. If you want to use COM2: use ttyS1 instead of ttyS0.
+
+After this you should set program which you are using to use 38400 bps
+speed which is now actually 230K or 460K. For more information check
+setserial man page (spd_cust).
+
+You can use serial port work as normal if you do<br>
+<br>
+# setserial /dev/ttyS0 spd_normal <br><br>
+After this you can also remove viahss module with rmmod if you need to.  Module doesn't intefere with normal serial port usage so you can leave
+it loaded if you don't need that extra 1KB which module uses.
+<H3>Download</H3>
+<A href=http://www.kati.fi/viahss/viahss-0.92.tar.gz>viahss-0.92.tar.gz</A> 
+
+<H3>Acknowledgments</H3>
+
+Thanks to Kimmo Rintala for help with divisor settings.<br>
+I also like to thank Jeff Garzik for help with VIA datasheets.<br>
+Port to 2.5/2.6 by Kingsly John with the help of <A href=http://lwn.net>LWN</A>
+
+<H3>Version History</H3>
+0.90	First release<br>
+0.91	Fixed Makefile <br>
+0.92 	Fixed for 2.5/2.6<br>
+
+<H3>Contact</H3>
+
+You can reach me by email: <A href=mailto:jrauti@iki.fi>jrauti@iki.fi</A>
+</body>
+</html>
+diff -Nurp linux-2.6.37/3rdparty/viahss/viahss.c linux-2.6.37.3rdparty/3rdparty/viahss/viahss.c
+--- linux-2.6.37/3rdparty/viahss/viahss.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-2.6.37.3rdparty/3rdparty/viahss/viahss.c	2003-07-17 09:49:59.000000000 +0300
+@@ -0,0 +1,83 @@
+/*
+ * VIA VT 82c686[AB] high speed serial port enabler
+ * Version 0.92
+ * Copyright (c) 2000-2001 Juhani Rautiainen <jrauti@iki.fi>
+ *
+ * 0.92:
+ *	Ported to 2.5/2.6 by Kingsly John
+ *	- Corrected locking (no more cli() and sti())
+ *	- New makefile
+ *	
+ * Can be freely distributed and used under the terms of the GNU GPL.
+*/
+
+#include <linux/module.h>
+#include <linux/config.h>
+#include <linux/version.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+
+const unsigned short confindex=0x3F0,confdata=0x3F1;
+const unsigned char spcidx=0xEE;
+
+spinlock_t driver_lock = SPIN_LOCK_UNLOCKED;
+
+static int __init viahss_init(void)
+{
+        struct pci_dev *pcidev = NULL;
+        unsigned char confval,val;
+        pcidev = pci_find_device (PCI_VENDOR_ID_VIA,PCI_DEVICE_ID_VIA_82C686,NULL);
+        if (pcidev) {
+                spin_lock_irq(&driver_lock);
+                /* start config */
+                pci_read_config_byte(pcidev,0x85,&confval);
+                confval |= 0x2;
+                pci_write_config_byte (pcidev, 0x85,confval);
+                /* activate high speed bits */
+                outb(spcidx,confindex); /* set index */
+                val = (unsigned char) inb(confdata);
+                val |= 0xC0;        /* both ports on high speed*/
+                outb (spcidx,confindex);
+                outb (val,confdata);
+                /*stop config*/
+                confval &= ~0x2;
+                pci_write_config_byte(pcidev, 0x85, confval);
+                spin_unlock_irq(&driver_lock);
+                printk (KERN_INFO "VIA VT82C686[AB] serial port high speed enabled\n");
+        }
+        else {
+                printk (KERN_INFO "Couldn't locate VIA chipset\n");
+                return -ENODEV;
+        }
+        return 0;
+}
+
+static void __exit viahss_exit(void)
+{
+        struct pci_dev *pcidev = NULL;
+        unsigned char confval,val;
+        pcidev = pci_find_device (PCI_VENDOR_ID_VIA,PCI_DEVICE_ID_VIA_82C686,NULL);
+        if (pcidev) {
+                spin_lock_irq(&driver_lock);
+                /* start config */
+                pci_read_config_byte(pcidev,0x85,&confval);
+                confval |= 0x2;
+                pci_write_config_byte (pcidev, 0x85,confval);
+                /* activate high speed bits */
+                outb(spcidx,confindex); /* set index */
+                val = (unsigned char) inb(confdata);
+                val &= ~0xC0;        /* both ports off high speed*/
+                outb (spcidx,confindex);
+                outb (val,confdata);
+                /*stop config*/
+                confval &= ~0x2;
+                pci_write_config_byte(pcidev, 0x85, confval);
+                spin_unlock_irq(&driver_lock);
+				printk (KERN_INFO "VIA VT82C686[AB] serial port high speed disabled\n");
+        }
+}
+
+module_init(viahss_init);
+module_exit(viahss_exit);
+MODULE_DESCRIPTION("VIA VT82C686[AB] high speed serial port enabler");
+MODULE_AUTHOR("Juhani Rautiainen <jrauti@iki.fi>");
@@ -0,0 +1,20 @@
+--- linux-2.6.35-rc6-git-mnb0.1/3rdparty/viahss/viahss.c.orig	2010-07-30 21:17:30.000000000 +0300
+++ linux-2.6.35-rc6-git-mnb0.1/3rdparty/viahss/viahss.c	2010-07-30 23:10:21.324978822 +0300
+@@ -25,7 +25,7 @@ static int __init viahss_init(void)
+ {
+         struct pci_dev *pcidev = NULL;
+         unsigned char confval,val;
+-        pcidev = pci_find_device (PCI_VENDOR_ID_VIA,PCI_DEVICE_ID_VIA_82C686,NULL);
+        pcidev = pci_get_device (PCI_VENDOR_ID_VIA,PCI_DEVICE_ID_VIA_82C686,NULL);
+         if (pcidev) {
+                 spin_lock_irq(&driver_lock);
+                 /* start config */
+@@ -55,7 +55,7 @@ static void __exit viahss_exit(void)
+ {
+         struct pci_dev *pcidev = NULL;
+         unsigned char confval,val;
+-        pcidev = pci_find_device (PCI_VENDOR_ID_VIA,PCI_DEVICE_ID_VIA_82C686,NULL);
+        pcidev = pci_get_device (PCI_VENDOR_ID_VIA,PCI_DEVICE_ID_VIA_82C686,NULL);
+         if (pcidev) {
+                 spin_lock_irq(&driver_lock);
+                 /* start config */
@@ -0,0 +1,19 @@
+
+fix build with 3.0
+
+Signed-off-by: Thomas Backlund <tmb@mageia.org>
+
+ 3rdparty/viahss/viahss.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/3rdparty/viahss/viahss.c.orig	2011-07-15 02:37:27.000000000 +0300
+++ a/3rdparty/viahss/viahss.c	2011-07-15 13:48:13.204291256 +0300
+@@ -19,7 +19,7 @@
+ const unsigned short confindex=0x3F0,confdata=0x3F1;
+ const unsigned char spcidx=0xEE;
+ 
+-spinlock_t driver_lock = SPIN_LOCK_UNLOCKED;
+DEFINE_SPINLOCK(driver_lock);
+ 
+ static int __init viahss_init(void)
+ {
@@ -0,0 +1,16 @@
+--- linux/3rdparty/Kconfig.orig	2019-05-31 23:33:39.796256889 +0300
+++ linux/3rdparty/Kconfig	2019-05-31 23:37:16.378970236 +0300
+@@ -5,5 +5,6 @@ menu "External 3rdparty kernel additions"
+ source "3rdparty/ndiswrapper/Kconfig"
+ source "3rdparty/rtl8812au/Kconfig"
+ source "3rdparty/rtl8723de/Kconfig"
+source "3rdparty/viahss/Kconfig"
+ 
+ endmenu
+--- linux/3rdparty/Makefile.orig	2019-05-31 23:33:57.608644657 +0300
+++ linux/3rdparty/Makefile	2019-05-31 23:37:39.711477814 +0300
+@@ -4,3 +4,4 @@ obj- := 3rdparty.o  # Dummy rule to forc
+ obj-$(CONFIG_NDISWRAPPER) += ndiswrapper/
+ obj-$(CONFIG_RTL8812AU)   += rtl8812au/
+ obj-$(CONFIG_RTL8723DE)   += rtl8723de/
+obj-$(CONFIG_VIAHSS)      += viahss/
@@ -0,0 +1,18 @@
+linux/config.h is gone in 2.6.21
+
+---
+ 3rdparty/viahss/viahss.c |    1 	0 +	1 -	0 !
+ 1 files changed, 1 deletion(-)
+
+Index: linux-2.6.21/3rdparty/viahss/viahss.c
+===================================================================
+--- linux-2.6.21.orig/3rdparty/viahss/viahss.c	2003-07-17 08:49:59.000000000 +0200
+++ linux-2.6.21/3rdparty/viahss/viahss.c	2007-05-14 17:06:56.000000000 +0200
+@@ -12,7 +12,6 @@
+ */
+ 
+ #include <linux/module.h>
+-#include <linux/config.h>
+ #include <linux/version.h>
+ #include <linux/init.h>
+ #include <linux/pci.h>
@@ -0,0 +1,7 @@
+--- linux-2.6.25/3rdparty/viahss/viahss.c.orig	2008-06-28 22:50:05.000000000 +0300
+++ linux-2.6.25/3rdparty/viahss/viahss.c	2008-06-29 14:26:55.000000000 +0300
+@@ -80,3 +80,4 @@ module_init(viahss_init);
+ module_exit(viahss_exit);
+ MODULE_DESCRIPTION("VIA VT82C686[AB] high speed serial port enabler");
+ MODULE_AUTHOR("Juhani Rautiainen <jrauti@iki.fi>");
+MODULE_LICENSE("GPL");
@@ -0,0 +1,305 @@
+From MAILER-DAEMON Wed Oct 14 16:34:37 2020
+From: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
+To: netdev@vger.kernel.org
+Cc: Gerrit Renker <gerrit@erg.abdn.ac.uk>, "David S. Miller" <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>, Thadeu Lima de Souza Cascardo <cascardo@canonical.com>, "Gustavo A. R. Silva" <gustavoars@kernel.org>, "Alexander A. Klimov" <grandmaster@al2klimov.de>, Kees Cook <keescook@chromium.org>, Eric Dumazet <edumazet@google.com>, Alexey Kodanev <alexey.kodanev@oracle.com>, dccp@vger.kernel.org, linux-kernel@vger.kernel.org
+Subject: [PATCH 1/2] dccp: ccid: move timers to struct dccp_sock
+Date: Tue, 13 Oct 2020 19:18:48 +0200
+Message-Id: <20201013171849.236025-2-kleber.souza@canonical.com>
+In-Reply-To: <20201013171849.236025-1-kleber.souza@canonical.com>
+References: <20201013171849.236025-1-kleber.souza@canonical.com>
+List-ID: <linux-kernel.vger.kernel.org>
+X-Mailing-List: linux-kernel@vger.kernel.org
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 7bit
+
+From: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
+
+When dccps_hc_tx_ccid is freed, ccid timers may still trigger. The reason
+del_timer_sync can't be used is because this relies on keeping a reference
+to struct sock. But as we keep a pointer to dccps_hc_tx_ccid and free that
+during disconnect, the timer should really belong to struct dccp_sock.
+
+This addresses CVE-2020-16119.
+
+Fixes: 839a6094140a (net: dccp: Convert timers to use timer_setup())
+Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
+Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
+Acked-bd: Richard Sailer <richard_siegfried@systemli.org>
+---
+ include/linux/dccp.h   |  2 ++
+ net/dccp/ccids/ccid2.c | 32 +++++++++++++++++++-------------
+ net/dccp/ccids/ccid3.c | 30 ++++++++++++++++++++----------
+ 3 files changed, 41 insertions(+), 23 deletions(-)
+
+diff --git a/include/linux/dccp.h b/include/linux/dccp.h
+index 07e547c02fd8..504afa1a4be6 100644
+--- a/include/linux/dccp.h
+++ b/include/linux/dccp.h
+@@ -259,6 +259,7 @@ struct dccp_ackvec;
+  * @dccps_sync_scheduled - flag which signals "send out-of-band message soon"
+  * @dccps_xmitlet - tasklet scheduled by the TX CCID to dequeue data packets
+  * @dccps_xmit_timer - used by the TX CCID to delay sending (rate-based pacing)
+ * @dccps_ccid_timer - used by the CCIDs
+  * @dccps_syn_rtt - RTT sample from Request/Response exchange (in usecs)
+  */
+ struct dccp_sock {
+@@ -303,6 +304,7 @@ struct dccp_sock {
+ 	__u8				dccps_sync_scheduled:1;
+ 	struct tasklet_struct		dccps_xmitlet;
+ 	struct timer_list		dccps_xmit_timer;
+	struct timer_list		dccps_ccid_timer;
+ };
+ 
+ static inline struct dccp_sock *dccp_sk(const struct sock *sk)
+diff --git a/net/dccp/ccids/ccid2.c b/net/dccp/ccids/ccid2.c
+index 3da1f77bd039..dbca1f1e2449 100644
+--- a/net/dccp/ccids/ccid2.c
+++ b/net/dccp/ccids/ccid2.c
+@@ -126,21 +126,26 @@ static void dccp_tasklet_schedule(struct sock *sk)
+ 
+ static void ccid2_hc_tx_rto_expire(struct timer_list *t)
+ {
+-	struct ccid2_hc_tx_sock *hc = from_timer(hc, t, tx_rtotimer);
+-	struct sock *sk = hc->sk;
+-	const bool sender_was_blocked = ccid2_cwnd_network_limited(hc);
+	struct dccp_sock *dp = from_timer(dp, t, dccps_ccid_timer);
+	struct sock *sk = (struct sock *)dp;
+	struct ccid2_hc_tx_sock *hc;
+	bool sender_was_blocked;
+ 
+ 	bh_lock_sock(sk);
+
+	if (inet_sk_state_load(sk) == DCCP_CLOSED)
+		goto out;
+
+	hc = ccid_priv(dp->dccps_hc_tx_ccid);
+	sender_was_blocked = ccid2_cwnd_network_limited(hc);
+
+ 	if (sock_owned_by_user(sk)) {
+-		sk_reset_timer(sk, &hc->tx_rtotimer, jiffies + HZ / 5);
+		sk_reset_timer(sk, &dp->dccps_ccid_timer, jiffies + HZ / 5);
+ 		goto out;
+ 	}
+ 
+ 	ccid2_pr_debug("RTO_EXPIRE\n");
+ 
+-	if (sk->sk_state == DCCP_CLOSED)
+-		goto out;
+-
+ 	/* back-off timer */
+ 	hc->tx_rto <<= 1;
+ 	if (hc->tx_rto > DCCP_RTO_MAX)
+@@ -166,7 +171,7 @@ static void ccid2_hc_tx_rto_expire(struct timer_list *t)
+ 	if (sender_was_blocked)
+ 		dccp_tasklet_schedule(sk);
+ 	/* restart backed-off timer */
+-	sk_reset_timer(sk, &hc->tx_rtotimer, jiffies + hc->tx_rto);
+	sk_reset_timer(sk, &dp->dccps_ccid_timer, jiffies + hc->tx_rto);
+ out:
+ 	bh_unlock_sock(sk);
+ 	sock_put(sk);
+@@ -330,7 +335,7 @@ static void ccid2_hc_tx_packet_sent(struct sock *sk, unsigned int len)
+ 	}
+ #endif
+ 
+-	sk_reset_timer(sk, &hc->tx_rtotimer, jiffies + hc->tx_rto);
+	sk_reset_timer(sk, &dp->dccps_ccid_timer, jiffies + hc->tx_rto);
+ 
+ #ifdef CONFIG_IP_DCCP_CCID2_DEBUG
+ 	do {
+@@ -700,9 +705,9 @@ static void ccid2_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
+ 
+ 	/* restart RTO timer if not all outstanding data has been acked */
+ 	if (hc->tx_pipe == 0)
+-		sk_stop_timer(sk, &hc->tx_rtotimer);
+		sk_stop_timer(sk, &dp->dccps_ccid_timer);
+ 	else
+-		sk_reset_timer(sk, &hc->tx_rtotimer, jiffies + hc->tx_rto);
+		sk_reset_timer(sk, &dp->dccps_ccid_timer, jiffies + hc->tx_rto);
+ done:
+ 	/* check if incoming Acks allow pending packets to be sent */
+ 	if (sender_was_blocked && !ccid2_cwnd_network_limited(hc))
+@@ -737,17 +742,18 @@ static int ccid2_hc_tx_init(struct ccid *ccid, struct sock *sk)
+ 	hc->tx_last_cong = hc->tx_lsndtime = hc->tx_cwnd_stamp = ccid2_jiffies32;
+ 	hc->tx_cwnd_used = 0;
+ 	hc->sk		 = sk;
+-	timer_setup(&hc->tx_rtotimer, ccid2_hc_tx_rto_expire, 0);
+	timer_setup(&dp->dccps_ccid_timer, ccid2_hc_tx_rto_expire, 0);
+ 	INIT_LIST_HEAD(&hc->tx_av_chunks);
+ 	return 0;
+ }
+ 
+ static void ccid2_hc_tx_exit(struct sock *sk)
+ {
+	struct dccp_sock *dp = dccp_sk(sk);
+ 	struct ccid2_hc_tx_sock *hc = ccid2_hc_tx_sk(sk);
+ 	int i;
+ 
+-	sk_stop_timer(sk, &hc->tx_rtotimer);
+	sk_stop_timer(sk, &dp->dccps_ccid_timer);
+ 
+ 	for (i = 0; i < hc->tx_seqbufc; i++)
+ 		kfree(hc->tx_seqbuf[i]);
+diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c
+index b9ee1a4a8955..685f4d046c0d 100644
+--- a/net/dccp/ccids/ccid3.c
+++ b/net/dccp/ccids/ccid3.c
+@@ -184,17 +184,24 @@ static inline void ccid3_hc_tx_update_win_count(struct ccid3_hc_tx_sock *hc,
+ 
+ static void ccid3_hc_tx_no_feedback_timer(struct timer_list *t)
+ {
+-	struct ccid3_hc_tx_sock *hc = from_timer(hc, t, tx_no_feedback_timer);
+-	struct sock *sk = hc->sk;
+	struct dccp_sock *dp = from_timer(dp, t, dccps_ccid_timer);
+	struct ccid3_hc_tx_sock *hc;
+	struct sock *sk = (struct sock *)dp;
+ 	unsigned long t_nfb = USEC_PER_SEC / 5;
+ 
+ 	bh_lock_sock(sk);
+
+	if (inet_sk_state_load(sk) == DCCP_CLOSED)
+		goto out;
+
+ 	if (sock_owned_by_user(sk)) {
+ 		/* Try again later. */
+ 		/* XXX: set some sensible MIB */
+ 		goto restart_timer;
+ 	}
+ 
+	hc = ccid_priv(dp->dccps_hc_tx_ccid);
+
+ 	ccid3_pr_debug("%s(%p, state=%s) - entry\n", dccp_role(sk), sk,
+ 		       ccid3_tx_state_name(hc->tx_state));
+ 
+@@ -250,8 +257,8 @@ static void ccid3_hc_tx_no_feedback_timer(struct timer_list *t)
+ 		t_nfb = max(hc->tx_t_rto, 2 * hc->tx_t_ipi);
+ 
+ restart_timer:
+-	sk_reset_timer(sk, &hc->tx_no_feedback_timer,
+-			   jiffies + usecs_to_jiffies(t_nfb));
+	sk_reset_timer(sk, &dp->dccps_ccid_timer,
+		       jiffies + usecs_to_jiffies(t_nfb));
+ out:
+ 	bh_unlock_sock(sk);
+ 	sock_put(sk);
+@@ -280,7 +287,7 @@ static int ccid3_hc_tx_send_packet(struct sock *sk, struct sk_buff *skb)
+ 		return -EBADMSG;
+ 
+ 	if (hc->tx_state == TFRC_SSTATE_NO_SENT) {
+-		sk_reset_timer(sk, &hc->tx_no_feedback_timer, (jiffies +
+		sk_reset_timer(sk, &dp->dccps_ccid_timer, (jiffies +
+ 			       usecs_to_jiffies(TFRC_INITIAL_TIMEOUT)));
+ 		hc->tx_last_win_count	= 0;
+ 		hc->tx_t_last_win_count = now;
+@@ -354,6 +361,7 @@ static void ccid3_hc_tx_packet_sent(struct sock *sk, unsigned int len)
+ static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
+ {
+ 	struct ccid3_hc_tx_sock *hc = ccid3_hc_tx_sk(sk);
+	struct dccp_sock *dp = dccp_sk(sk);
+ 	struct tfrc_tx_hist_entry *acked;
+ 	ktime_t now;
+ 	unsigned long t_nfb;
+@@ -420,7 +428,7 @@ static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
+ 			       (unsigned int)(hc->tx_x >> 6));
+ 
+ 	/* unschedule no feedback timer */
+-	sk_stop_timer(sk, &hc->tx_no_feedback_timer);
+	sk_stop_timer(sk, &dp->dccps_ccid_timer);
+ 
+ 	/*
+ 	 * As we have calculated new ipi, delta, t_nom it is possible
+@@ -445,8 +453,8 @@ static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
+ 		       "expire in %lu jiffies (%luus)\n",
+ 		       dccp_role(sk), sk, usecs_to_jiffies(t_nfb), t_nfb);
+ 
+-	sk_reset_timer(sk, &hc->tx_no_feedback_timer,
+-			   jiffies + usecs_to_jiffies(t_nfb));
+	sk_reset_timer(sk, &dp->dccps_ccid_timer,
+		       jiffies + usecs_to_jiffies(t_nfb));
+ }
+ 
+ static int ccid3_hc_tx_parse_options(struct sock *sk, u8 packet_type,
+@@ -488,21 +496,23 @@ static int ccid3_hc_tx_parse_options(struct sock *sk, u8 packet_type,
+ 
+ static int ccid3_hc_tx_init(struct ccid *ccid, struct sock *sk)
+ {
+	struct dccp_sock *dp = dccp_sk(sk);
+ 	struct ccid3_hc_tx_sock *hc = ccid_priv(ccid);
+ 
+ 	hc->tx_state = TFRC_SSTATE_NO_SENT;
+ 	hc->tx_hist  = NULL;
+ 	hc->sk	     = sk;
+-	timer_setup(&hc->tx_no_feedback_timer,
+	timer_setup(&dp->dccps_ccid_timer,
+ 		    ccid3_hc_tx_no_feedback_timer, 0);
+ 	return 0;
+ }
+ 
+ static void ccid3_hc_tx_exit(struct sock *sk)
+ {
+	struct dccp_sock *dp = dccp_sk(sk);
+ 	struct ccid3_hc_tx_sock *hc = ccid3_hc_tx_sk(sk);
+ 
+-	sk_stop_timer(sk, &hc->tx_no_feedback_timer);
+	sk_stop_timer(sk, &dp->dccps_ccid_timer);
+ 	tfrc_tx_hist_purge(&hc->tx_hist);
+ }
+ 
+-- 
+2.25.1
+
+
+From MAILER-DAEMON Wed Oct 14 16:34:37 2020
+From: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
+To: netdev@vger.kernel.org
+Cc: Gerrit Renker <gerrit@erg.abdn.ac.uk>, "David S. Miller" <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>, Thadeu Lima de Souza Cascardo <cascardo@canonical.com>, "Gustavo A. R. Silva" <gustavoars@kernel.org>, "Alexander A. Klimov" <grandmaster@al2klimov.de>, Kees Cook <keescook@chromium.org>, Eric Dumazet <edumazet@google.com>, Alexey Kodanev <alexey.kodanev@oracle.com>, dccp@vger.kernel.org, linux-kernel@vger.kernel.org
+Subject: [PATCH 2/2] Revert "dccp: don't free ccid2_hc_tx_sock struct in dccp_disconnect()"
+Date: Tue, 13 Oct 2020 19:18:49 +0200
+Message-Id: <20201013171849.236025-3-kleber.souza@canonical.com>
+In-Reply-To: <20201013171849.236025-1-kleber.souza@canonical.com>
+References: <20201013171849.236025-1-kleber.souza@canonical.com>
+List-ID: <linux-kernel.vger.kernel.org>
+X-Mailing-List: linux-kernel@vger.kernel.org
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 7bit
+
+From: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
+
+This reverts commit 2677d20677314101293e6da0094ede7b5526d2b1.
+
+This fixes an issue that after disconnect, dccps_hc_tx_ccid will still be
+kept, allowing the socket to be reused as a listener socket, and the cloned
+socket will free its dccps_hc_tx_ccid, leading to a later use after free,
+when the listener socket is closed.
+
+This addresses CVE-2020-16119.
+
+Fixes: 2677d2067731 (dccp: don't free ccid2_hc_tx_sock struct in dccp_disconnect())
+Reported-by: Hadar Manor
+Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
+Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
+Acked-by: Richard Sailer <richard_siegfried@systemli.org>
+---
+ net/dccp/proto.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/net/dccp/proto.c b/net/dccp/proto.c
+index 6d705d90c614..359e848dba6c 100644
+--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
+@@ -279,7 +279,9 @@ int dccp_disconnect(struct sock *sk, int flags)
+ 
+ 	dccp_clear_xmit_timers(sk);
+ 	ccid_hc_rx_delete(dp->dccps_hc_rx_ccid, sk);
+	ccid_hc_tx_delete(dp->dccps_hc_tx_ccid, sk);
+ 	dp->dccps_hc_rx_ccid = NULL;
+	dp->dccps_hc_tx_ccid = NULL;
+ 
+ 	__skb_queue_purge(&sk->sk_receive_queue);
+ 	__skb_queue_purge(&sk->sk_write_queue);
+-- 
+2.25.1
+
+
@@ -12,7 +12,7 @@
        <IsA>app:gui</IsA>
        <Summary>Performance analyser tool that makes full use of the Linux performance counter subsystem</Summary>
        <Description>perf is a new tool which is used to optimize, validate and measure applications, workloads or the full system through the Linux performance counter subsystem.</Description>
-        <Archive sha1sum="20aff5a230468492c2b9e6e84db4d8f18d364871" type="targz">https://mirrors.edge.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.gz</Archive>
+        <Archive sha1sum="baa841f624f6cfdafe01026963dcd32b334a3752" type="targz">https://mirrors.edge.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.gz</Archive>
        <BuildDependencies>
            <Dependency>libunwind-devel</Dependency>
            <Dependency>audit-devel</Dependency>
@@ -42,12 +42,43 @@
        </BuildDependencies>
        <Patches>
            <!-- Linux patches -->
-            <Patch level="1" compressionType="xz">patches/linux/patch-5.7.14.xz</Patch>
+            <Patch level="1" compressionType="xz">patches/linux/patch-5.10.3.xz</Patch>
            <!-- Mageia Linux patches-->
-            <Patch level="1">patches/mageia/fs-aufs-5.6.patch</Patch>
-            <Patch level="1">patches/mageia/fs-aufs-5.6-modular.patch</Patch>
-            <Patch level="1">patches/mageia/fs-aufs-5.6-fix.patch</Patch>
+            <Patch level="1">patches/mageia/fs-aufs5.patch</Patch>
            <Patch level="1">patches/mageia/CVE-2019-12379.patch</Patch>
+            
+            <Patch level="1">patches/mageia/3rd-3rdparty-tree.patch</Patch>
+            <Patch level="1">patches/mageia/3rd-3rdparty-merge.patch</Patch>
+            
+            <Patch level="1">patches/mageia/3rd-ndiswrapper-1.63.patch</Patch>
+            <Patch level="1">patches/mageia/3rd-ndiswrapper-Kconfig.patch</Patch>
+            <Patch level="1">patches/mageia/3rd-ndiswrapper-Makefile-build-fix.patch</Patch>
+            <Patch level="1">patches/mageia/3rd-niswrapper-Kconfig-Makefile.patch</Patch>
+            
+            <Patch level="1">patches/mageia/3rd-rtl8812au.patch</Patch>
+            <Patch level="1">patches/mageia/3rd-rtl8812au-Kconfig-Makefile.patch</Patch>
+            <Patch level="1">patches/mageia/3rd-rtl8812au-rename.patch</Patch>
+            <Patch level="1">patches/mageia/3rd-rtl8812au-kernel-5.10.patch</Patch>
+            
+            <Patch level="1">patches/mageia/3rd-rtl8723de.patch</Patch>
+            <Patch level="1">patches/mageia/3rd-rtl8723de-Kconfig-Makefile.patch</Patch>
+            <Patch level="1">patches/mageia/3rd-rtl8723de-fix-redefine.patch</Patch>
+            <Patch level="1">patches/mageia/3rd-rtl8723de-nodebug.patch</Patch>
+            <Patch level="1">patches/mageia/3rd-rtl8223de-kernel-5.6.patch</Patch>
+            <Patch level="1">patches/mageia/3rd-rtl8723de-add-kernel-5.8-support.patch</Patch>
+            
+            <Patch level="1">patches/mageia/3rd-viahss-0.92.patch</Patch>
+            <Patch level="1">patches/mageia/3rd-viahss-config.patch</Patch>
+            <Patch level="1">patches/mageia/3rd-viahss-module-license.patch</Patch>
+            <Patch level="1">patches/mageia/3rd-viahss-2.6.35-buildfix.patch</Patch>
+            <Patch level="1">patches/mageia/3rd-viahss-3.0-buildfix.patch</Patch>
+            <Patch level="1">patches/mageia/3rd-viahss-Kconfig-Makefile.patch</Patch>
+            
+            <Patch level="1">patches/mageia/3rd-rtl8821ce.patch</Patch>
+            <Patch level="1">patches/mageia/3rd-rtl8821ce-Kconfig-Makefile.patch</Patch>
+            <Patch level="1">patches/mageia/3rd-rtl8821ce-5.8-fix.patch</Patch>
+            
+            <Patch level="1">patches/mageia/3rd-fix-kconfig.patch</Patch>
        </Patches>
    </Source>

@@ -81,6 +112,13 @@
        </Files>
    </Package>
    <History>
+        <Update release="232">
+            <Date>2020-12-27</Date>
+            <Version>5.10.3</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Idris Kalp</Name>
+            <Email>idriskalp@gmail.com</Email>
+        </Update>
        <Update release="22">
            <Date>2020-08-07</Date>
            <Version>5.7.14</Version>