Skip to content

Commit 50dda8c

Browse files
committed
compat: account for latest c8s backports
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
1 parent d378f93 commit 50dda8c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/compat/compat.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#define ISRHEL7
1717
#elif RHEL_MAJOR == 8
1818
#define ISRHEL8
19-
#if RHEL_MINOR >= 4
19+
#if RHEL_MINOR >= 5
2020
#define ISCENTOS8S
2121
#endif
2222
#endif
@@ -757,7 +757,7 @@ static inline void crypto_xor_cpy(u8 *dst, const u8 *src1, const u8 *src2,
757757
#define hlist_add_behind(a, b) hlist_add_after(b, a)
758758
#endif
759759

760-
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) && !defined(ISCENTOS8S)
760+
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) && !defined(ISRHEL8)
761761
#define totalram_pages() totalram_pages
762762
#endif
763763

@@ -849,7 +849,7 @@ static inline void skb_mark_not_on_list(struct sk_buff *skb)
849849
#endif
850850
#endif
851851

852-
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0)
852+
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0) && !defined(ISCENTOS8S)
853853
#define genl_dumpit_info(cb) ({ \
854854
struct { struct nlattr **attrs; } *a = (void *)((u8 *)cb->args + offsetofend(struct dump_ctx, next_allowedip)); \
855855
BUILD_BUG_ON(sizeof(cb->args) < offsetofend(struct dump_ctx, next_allowedip) + sizeof(*a)); \

0 commit comments

Comments
 (0)