diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-04-19 05:33:42 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-04-21 04:31:26 +0200 |
| commit | 08c09a63fd766e3557c8e63acf3dc90c86549a1e (patch) | |
| tree | a7de662761b6723e6d681160ca3aec78887a00c1 /src | |
| parent | 47559171643131799d76511cf7abdf81a2029e39 (diff) | |
compat: work on old 3.10
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/compat/compat.h | 31 | ||||
| -rw-r--r-- | src/compat/udp_tunnel/udp_tunnel.c | 4 |
2 files changed, 35 insertions, 0 deletions
diff --git a/src/compat/compat.h b/src/compat/compat.h index 28b8468..2db31ef 100644 --- a/src/compat/compat.h +++ b/src/compat/compat.h @@ -200,6 +200,37 @@ static inline int crypto_memneq(const void *a, const void *b, size_t size) } #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 75) +#define U8_MAX ((u8)~0U) +#define S8_MAX ((s8)(U8_MAX >> 1)) +#define S8_MIN ((s8)(-S8_MAX - 1)) +#define U16_MAX ((u16)~0U) +#define S16_MAX ((s16)(U16_MAX >> 1)) +#define S16_MIN ((s16)(-S16_MAX - 1)) +#define U32_MAX ((u32)~0U) +#define S32_MAX ((s32)(U32_MAX >> 1)) +#define S32_MIN ((s32)(-S32_MAX - 1)) +#define U64_MAX ((u64)~0ULL) +#define S64_MAX ((s64)(U64_MAX >> 1)) +#define S64_MIN ((s64)(-S64_MAX - 1)) +#endif + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 60) +/* Making this static may very well invalidate its usefulness, + * but so it goes with compat code. */ +static inline void memzero_explicit(void *s, size_t count) +{ + memset(s, 0, count); + barrier(); +} +#endif + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) +static const struct in6_addr our_in6addr_any = IN6ADDR_ANY_INIT; +#define in6addr_any our_in6addr_any +#endif + + /* https://lkml.org/lkml/2015/6/12/415 */ #include <linux/netdevice.h> static inline struct net_device *netdev_pub(void *dev) diff --git a/src/compat/udp_tunnel/udp_tunnel.c b/src/compat/udp_tunnel/udp_tunnel.c index d1286c0..88fb905 100644 --- a/src/compat/udp_tunnel/udp_tunnel.c +++ b/src/compat/udp_tunnel/udp_tunnel.c @@ -164,7 +164,11 @@ static int our_iptunnel_xmit(struct rtable *rt, struct sk_buff *skb, iph->daddr = dst; iph->saddr = src; iph->ttl = ttl; +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 53) + __ip_select_ident(iph, &rt->dst, (skb_shinfo(skb)->gso_segs ?: 1) - 1); +#else __ip_select_ident(iph, skb_shinfo(skb)->gso_segs ?: 1); +#endif err = ip_local_out(skb); if (unlikely(net_xmit_eval(err))) |