aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorPeter Georg <peter.georg@physik.uni-regensburg.de>2021-11-16 17:52:22 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2021-11-16 18:12:02 +0100
commit77256108c0edcaee78dc16352e7339fb13ddeb05 (patch)
tree137bd1e86b2fef3741bbde5304c669d0cf8a5485
parentcrypto: curve25519-x86_64: solve register constraints with reserved registers (diff)
downloadwireguard-linux-compat-77256108c0edcaee78dc16352e7339fb13ddeb05.tar.xz
wireguard-linux-compat-77256108c0edcaee78dc16352e7339fb13ddeb05.zip
compat: update for RHEL 8.5
RHEL 8.5 has been released. Replace all ISCENTOS8S checks with ISRHEL8. Increase RHEL_MINOR for CentOS 8 Stream detection to 6. Signed-off-by: Peter Georg <peter.georg@physik.uni-regensburg.de> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
-rw-r--r--src/compat/compat-asm.h4
-rw-r--r--src/compat/compat.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/compat/compat-asm.h b/src/compat/compat-asm.h
index 5bfdb94..951fc10 100644
--- a/src/compat/compat-asm.h
+++ b/src/compat/compat-asm.h
@@ -15,7 +15,7 @@
#define ISRHEL7
#elif RHEL_MAJOR == 8
#define ISRHEL8
-#if RHEL_MINOR >= 4
+#if RHEL_MINOR >= 6
#define ISCENTOS8S
#endif
#endif
@@ -51,7 +51,7 @@
#undef pull
#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 76) && !defined(ISCENTOS8S) && !defined(SYM_FUNC_START)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 76) && !defined(ISRHEL8) && !defined(SYM_FUNC_START)
#define SYM_FUNC_START ENTRY
#define SYM_FUNC_END ENDPROC
#endif
diff --git a/src/compat/compat.h b/src/compat/compat.h
index ee45a3c..9aa767a 100644
--- a/src/compat/compat.h
+++ b/src/compat/compat.h
@@ -16,7 +16,7 @@
#define ISRHEL7
#elif RHEL_MAJOR == 8
#define ISRHEL8
-#if RHEL_MINOR >= 5
+#if RHEL_MINOR >= 6
#define ISCENTOS8S
#endif
#endif
@@ -855,7 +855,7 @@ static inline void skb_mark_not_on_list(struct sk_buff *skb)
#endif
#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0) && !defined(ISCENTOS8S)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0) && !defined(ISRHEL8)
#define genl_dumpit_info(cb) ({ \
struct { struct nlattr **attrs; } *a = (void *)((u8 *)cb->args + offsetofend(struct dump_ctx, next_allowedip)); \
BUILD_BUG_ON(sizeof(cb->args) < offsetofend(struct dump_ctx, next_allowedip) + sizeof(*a)); \