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

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

net: Update WireGuard to v1.0.20210424

parent 4c155af3

net/wireguard/compat/compat-asm.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#define ISRHEL7

#elif RHEL_MAJOR == 8

#define ISRHEL8

#if RHEL_MINOR == 4

#if RHEL_MINOR >= 4

#define ISCENTOS8S

#endif

#endif

net/wireguard/compat/compat.h

+3 −3
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#define ISRHEL7

#elif RHEL_MAJOR == 8

#define ISRHEL8

#if RHEL_MINOR == 4

#if RHEL_MINOR >= 4

#define ISCENTOS8S

#endif

#endif
@@ -823,7 +823,7 @@ static __always_inline void old_rcu_barrier(void) 
#define COMPAT_CANNOT_DEPRECIATE_BH_RCU

#endif



#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 10) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) && !defined(ISRHEL8) && !defined(ISUBUNTU1804)) || LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 217)

#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 10) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) && !defined(ISRHEL8)) || LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 217)

static inline void skb_mark_not_on_list(struct sk_buff *skb)

{

	skb->next = NULL;
@@ -932,7 +932,7 @@ static inline int skb_ensure_writable(struct sk_buff *skb, int write_len) 
}

#endif



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

#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)) || (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 102) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0)) || (LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 178) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)) || (LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 223) && LINUX_VERSION_CODE > KERNEL_VERSION(4, 10, 0)) || LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 259) || defined(ISRHEL8) || defined(ISUBUNTU1804)

#include <linux/icmpv6.h>

#include <net/icmp.h>

#if IS_ENABLED(CONFIG_NF_NAT)

net/wireguard/version.h

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

#define WIREGUARD_VERSION "1.0.20210219"

#define WIREGUARD_VERSION "1.0.20210424"

#endif