diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-05-20 19:06:24 +0800 |
|---|---|---|
| committer | blacksuan19 <i@blacksuan19.me> | 2020-05-20 19:06:24 +0800 |
| commit | d6328503c46ef2d8769d1c847529943a76ac63fb (patch) | |
| tree | a50e4a3d30c9d8d2b6f0fd5288df5046885fb4f6 | |
| parent | 2241f7ff3af6a9da6063afd4c38bf5496920323c (diff) | |
compat: ip6_dst_lookup_flow was backported to 4.14, 4.9, and 4.4
Also remove the confusing 119/118 distinction from the Debian clause,
which is no longer as important.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: blacksuan19 <i@blacksuan19.me>
| -rw-r--r-- | net/wireguard/compat/compat.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/wireguard/compat/compat.h b/net/wireguard/compat/compat.h index dfe5c3e7bcb4..f4cc5148eb67 100644 --- a/net/wireguard/compat/compat.h +++ b/net/wireguard/compat/compat.h @@ -431,8 +431,7 @@ static inline u64 ktime_get_coarse_boottime_ns(void) { #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) return ktime_to_ns(ktime_get_boottime()); -#elif (LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 12) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0)) || LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 53) - return ktime_to_ns(ktime_mono_to_any(ns_to_ktime(jiffies64_to_nsecs(get_jiffies_64())), TK_OFFS_BOOT)); +#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(ISHREL8) && !defined(ISDEBIAN) && 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) return ktime_to_ns(ktime_mono_to_any(ns_to_ktime(jiffies64_to_nsecs(get_jiffies_64())), TK_OFFS_BOOT)); #else return ktime_to_ns(ktime_get_coarse_boottime()); #endif |