Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit d2f55e69 authored by derfelot's avatar derfelot
Browse files

net: Update WireGuard to 1.0.20200729 snapshot

parent 259903ab

net/wireguard/compat/compat.h

+7 −2
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ 
#ifdef RHEL_MAJOR

#if RHEL_MAJOR == 7

#define ISRHEL7

#if RHEL_MINOR == 8

#define ISCENTOS7

#endif

#elif RHEL_MAJOR == 8

#define ISRHEL8

#if RHEL_MINOR == 2
@@ -94,7 +97,7 @@ 


#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) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0) && !defined(ISUBUNTU1904)) || (!defined(ISRHEL8) && !defined(ISDEBIAN) && !defined(ISUBUNTU1804) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 119) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)) || (LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 181) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)) || (LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 224) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)) || (LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 224) && !defined(ISUBUNTU1604))

#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) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0) && !defined(ISUBUNTU1904)) || (!defined(ISRHEL8) && !defined(ISDEBIAN) && !defined(ISUBUNTU1804) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 119) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)) || (LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 181) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)) || (LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 224) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)) || (LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 224) && !defined(ISUBUNTU1604) && (!defined(ISRHEL7) || defined(ISCENTOS7)))

#define ipv6_dst_lookup_flow(a, b, c, d) ipv6_dst_lookup(a, b, &dst, c) + (void *)0 ?: dst

#endif
@@ -942,7 +945,7 @@ static inline int skb_ensure_writable(struct sk_buff *skb, int write_len) 
#include <net/ipv6.h>

#include <net/icmp.h>

#include <net/netfilter/nf_conntrack.h>

#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)

#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) && !defined(ISRHEL8)

#include <net/netfilter/nf_nat_core.h>

#endif

static inline void __compat_icmp_ndo_send(struct sk_buff *skb_in, int type, int code, __be32 info)
@@ -1045,6 +1048,8 @@ static inline void skb_reset_redirect(struct sk_buff *skb) 


#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)

#include <linux/skbuff.h>

#include <linux/ip.h>

#include <linux/ipv6.h>

static inline __be16 ip_tunnel_parse_protocol(const struct sk_buff *skb)

{

	if (skb_network_header(skb) >= skb->head &&

net/wireguard/version.h

+1 −1
Original line number Diff line number Diff line 
#ifndef WIREGUARD_VERSION

#define WIREGUARD_VERSION "1.0.20200712"

#define WIREGUARD_VERSION "1.0.20200729"

#endif