diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-04-29 04:29:08 -0600 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-04-29 04:44:20 -0600 |
| commit | 787b0dada39add1b0f9f5ed9cead9c1a2ed36127 (patch) | |
| tree | 2893d2013ffe74bd167e693dde2433a3123816d5 /src/compat | |
| parent | d5e4cd080695369d699e20c2b12828001be06e04 (diff) | |
compat: ip6_dst_lookup_flow was backported to 3.16.83
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'src/compat')
| -rw-r--r-- | src/compat/compat.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/compat/compat.h b/src/compat/compat.h index c08283d..6b28f1a 100644 --- a/src/compat/compat.h +++ b/src/compat/compat.h @@ -96,6 +96,12 @@ #define ipv6_dst_lookup(a, b, c, d) ipv6_dst_lookup(b, c, d) #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 83) +#define ipv6_dst_lookup_flow(a, b, c, d) ipv6_dst_lookup_flow(b, c, d) +#elif (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 5) && LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0)) || (LINUX_VERSION_CODE < KERNEL_VERSION(5, 3, 18) && !defined(ISRHEL82)) +#define ipv6_dst_lookup_flow(a, b, c, d) ipv6_dst_lookup(a, b, &dst, c) + (void *)0 ?: dst +#endif + #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) && IS_ENABLED(CONFIG_IPV6) && !defined(ISRHEL7) #include <net/ipv6.h> struct ipv6_stub_type { @@ -109,7 +115,6 @@ static const struct ipv6_stub_type ipv6_stub_impl = { static const struct ipv6_stub_type *ipv6_stub = &ipv6_stub_impl; #endif - #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0) && IS_ENABLED(CONFIG_IPV6) && !defined(ISOPENSUSE42) && !defined(ISRHEL7) #include <net/addrconf.h> static inline bool ipv6_mod_enabled(void) @@ -861,10 +866,6 @@ static inline void skb_mark_not_on_list(struct sk_buff *skb) }) #endif -#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 5) && LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0)) || (LINUX_VERSION_CODE < KERNEL_VERSION(5, 3, 18) && !defined(ISRHEL82)) -#define ipv6_dst_lookup_flow(a, b, c, d) ipv6_dst_lookup(a, b, &dst, c) + (void *)0 ?: dst -#endif - #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0) #include <linux/skbuff.h> #ifndef skb_list_walk_safe |