* [PATCH compat] Update for RHEL 8.5
@ 2021-11-16 16:52 Peter Georg
2021-11-16 17:14 ` Jason A. Donenfeld
0 siblings, 1 reply; 2+ messages in thread
From: Peter Georg @ 2021-11-16 16:52 UTC (permalink / raw)
To: wireguard
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>
---
src/compat/compat-asm.h | 4 ++--
src/compat/compat.h | 4 ++--
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)); \
--
2.31.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH compat] Update for RHEL 8.5
2021-11-16 16:52 [PATCH compat] Update for RHEL 8.5 Peter Georg
@ 2021-11-16 17:14 ` Jason A. Donenfeld
0 siblings, 0 replies; 2+ messages in thread
From: Jason A. Donenfeld @ 2021-11-16 17:14 UTC (permalink / raw)
To: Peter Georg; +Cc: WireGuard mailing list
Applied! Thank you.
https://git.zx2c4.com/wireguard-linux-compat/commit/?id=77256108c0edcaee78dc16352e7339fb13ddeb05
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-11-16 17:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-16 16:52 [PATCH compat] Update for RHEL 8.5 Peter Georg
2021-11-16 17:14 ` Jason A. Donenfeld
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).