From 27db599cf64533488a7e57f222348ff5f90e78bd Mon Sep 17 00:00:00 2001
From: secuflag <secuflag@ticino.com>
Date: Fri, 30 Apr 2021 16:26:37 +0200
Subject: [PATCH] WireGuard 1.0.20210424

---
 net/wireguard/compat/compat-asm.h | 2 +-
 net/wireguard/compat/compat.h     | 6 +++---
 net/wireguard/dkms.conf           | 2 +-
 net/wireguard/version.h           | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/net/wireguard/compat/compat-asm.h b/net/wireguard/compat/compat-asm.h
index 7067afd9b5e1..fde21dabba4f 100644
--- a/net/wireguard/compat/compat-asm.h
+++ b/net/wireguard/compat/compat-asm.h
@@ -15,7 +15,7 @@
 #define ISRHEL7
 #elif RHEL_MAJOR == 8
 #define ISRHEL8
-#if RHEL_MINOR == 4
+#if RHEL_MINOR >= 4
 #define ISCENTOS8S
 #endif
 #endif
diff --git a/net/wireguard/compat/compat.h b/net/wireguard/compat/compat.h
index 3e8e005c81c6..91d4388824ea 100644
--- a/net/wireguard/compat/compat.h
+++ b/net/wireguard/compat/compat.h
@@ -16,7 +16,7 @@
 #define ISRHEL7
 #elif RHEL_MAJOR == 8
 #define ISRHEL8
-#if RHEL_MINOR == 4
+#if RHEL_MINOR >= 4
 #define ISCENTOS8S
 #endif
 #endif
@@ -823,7 +823,7 @@ static __always_inline void old_rcu_barrier(void)
 #define COMPAT_CANNOT_DEPRECIATE_BH_RCU
 #endif
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 10) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) && !defined(ISRHEL8) && !defined(ISUBUNTU1804)) || LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 217)
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 10) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) && !defined(ISRHEL8)) || LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 217)
 static inline void skb_mark_not_on_list(struct sk_buff *skb)
 {
 	skb->next = NULL;
@@ -932,7 +932,7 @@ static inline int skb_ensure_writable(struct sk_buff *skb, int write_len)
 }
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)) || (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 102) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0)) || (LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 178) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)) || (LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 223) && LINUX_VERSION_CODE > KERNEL_VERSION(4, 10, 0)) || LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 259) || defined(ISRHEL8) || defined(ISUBUNTU1804)
 #include <linux/icmpv6.h>
 #include <net/icmp.h>
 #if IS_ENABLED(CONFIG_NF_NAT)
diff --git a/net/wireguard/dkms.conf b/net/wireguard/dkms.conf
index ad197f1961a2..23b57a487b69 100644
--- a/net/wireguard/dkms.conf
+++ b/net/wireguard/dkms.conf
@@ -1,5 +1,5 @@
 PACKAGE_NAME="wireguard"
-PACKAGE_VERSION="1.0.20210219"
+PACKAGE_VERSION="1.0.20210424"
 AUTOINSTALL=yes
 
 BUILT_MODULE_NAME="wireguard"
diff --git a/net/wireguard/version.h b/net/wireguard/version.h
index 456073ba41ea..3d338a9d5aaa 100644
--- a/net/wireguard/version.h
+++ b/net/wireguard/version.h
@@ -1,3 +1,3 @@
 #ifndef WIREGUARD_VERSION
-#define WIREGUARD_VERSION "1.0.20210219"
+#define WIREGUARD_VERSION "1.0.20210424"
 #endif