diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2018-05-10 18:11:02 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-05-13 16:58:53 +0200 |
| commit | 4014532363ea7d1e07fb265cde935305c8e71b13 (patch) | |
| tree | 2f84ee885eed2e94f56e83bfb93ee576454f4302 | |
| parent | queueing: preserve pfmemalloc header bit (diff) | |
| download | wireguard-monolithic-historical-4014532363ea7d1e07fb265cde935305c8e71b13.tar.xz wireguard-monolithic-historical-4014532363ea7d1e07fb265cde935305c8e71b13.zip | |
compat: handle RHEL 7.5's recent backports
| -rw-r--r-- | src/compat/compat.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/compat/compat.h b/src/compat/compat.h index 650b06b..1317345 100644 --- a/src/compat/compat.h +++ b/src/compat/compat.h @@ -110,7 +110,7 @@ static inline bool ipv6_mod_enabled(void) } #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) && !defined(ISRHEL7) #include <linux/skbuff.h> static inline void skb_reset_tc(struct sk_buff *skb) { @@ -173,7 +173,7 @@ static inline void netif_keep_dst(struct net_device *dev) #endif #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) && !defined(ISRHEL7) #include "checksum/checksum_partial_compat.h" static inline void *our_pskb_put(struct sk_buff *skb, struct sk_buff *tail, int len) { @@ -441,7 +441,7 @@ static inline void kvfree_ours(const void *addr) #define nla_parse_nested(a, b, c, d, e) nla_parse_nested(a, b, c, d) #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) && !defined(ISRHEL7) static inline struct nlattr **genl_family_attrbuf(const struct genl_family *family) { return family->attrbuf; @@ -464,9 +464,9 @@ static inline struct nlattr **genl_family_attrbuf(const struct genl_family *fami #endif #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) && !defined(ISRHEL7) #include <net/genetlink.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0) && !defined(ISRHEL7) +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0) #define genl_register_family(a) genl_register_family_with_ops(a, genl_ops, ARRAY_SIZE(genl_ops)) #define COMPAT_CANNOT_USE_CONST_GENL_OPS #else |