From 3975646af03fb58539aa1fc34694fc998f28605e Mon Sep 17 00:00:00 2001 From: Abdulsamet Date: Mon, 8 Feb 2021 03:01:13 +0300 Subject: [PATCH] net:Kconfig Wireguard include --- net/Kconfig | 2 +- net/wireguard/src/compat/compat.h | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/net/Kconfig b/net/Kconfig index b01f9fcf2d02..fdf1efbe3fd4 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -90,7 +90,7 @@ config INET Short answer: say Y. if INET -source "net/wireguard/Kconfig" +source "net/wireguard/src/Kconfig" source "net/ipv4/Kconfig" source "net/ipv6/Kconfig" source "net/netlabel/Kconfig" diff --git a/net/wireguard/src/compat/compat.h b/net/wireguard/src/compat/compat.h index edc05027636f..f29fa07a17ea 100644 --- a/net/wireguard/src/compat/compat.h +++ b/net/wireguard/src/compat/compat.h @@ -91,7 +91,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) && !defined(ISRHEL7)) +#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, 5, 0) && !defined(ISUBUNTU1604) && !defined(ISRHEL7) #define ipv6_dst_lookup_flow(a, b, c, d) ipv6_dst_lookup(a, b, &dst, c) + (void *)0 ?: dst #endif @@ -677,14 +677,12 @@ static inline void *skb_put_data(struct sk_buff *skb, const void *data, unsigned #define napi_complete_done(n, work_done) napi_complete(n) #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) #include /* NAPI_STATE_SCHED gets set by netif_napi_add anyway, so this is safe. * Also, kernels without NAPI_STATE_NO_BUSY_POLL don't have a call to * napi_hash_add inside of netif_napi_add. */ #define NAPI_STATE_NO_BUSY_POLL NAPI_STATE_SCHED -#endif #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) #include @@ -823,7 +821,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)) || LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 217) +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 10) && !defined(ISRHEL8) static inline void skb_mark_not_on_list(struct sk_buff *skb) { skb->next = NULL;