]>
Commit | Line | Data |
---|---|---|
f773a8ff JR |
1 | --- wireguard-linux-compat-1.0.20210124/src/compat/compat.h~ 2021-01-24 14:45:29.000000000 +0100 |
2 | +++ wireguard-linux-compat-1.0.20210124/src/compat/compat.h 2021-02-06 23:07:40.593824415 +0100 | |
3 | @@ -91,7 +91,7 @@ | |
4 | ||
5 | #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 83) | |
6 | #define ipv6_dst_lookup_flow(a, b, c, d) ipv6_dst_lookup_flow(b, c, d) | |
7 | -#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)) | |
8 | +#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, 11, 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)) | |
9 | #define ipv6_dst_lookup_flow(a, b, c, d) ipv6_dst_lookup(a, b, &dst, c) + (void *)0 ?: dst | |
10 | #endif | |
11 | ||
12 | @@ -531,7 +531,7 @@ | |
13 | #define nla_parse_nested(a, b, c, d, e) nla_parse_nested(a, b, c, d) | |
14 | #endif | |
15 | ||
16 | -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) && !defined(ISRHEL7) | |
17 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) && !defined(ISRHEL7) | |
18 | static inline struct nlattr **genl_family_attrbuf(const struct genl_family *family) | |
19 | { | |
20 | return family->attrbuf; | |
21 | @@ -554,7 +554,7 @@ | |
22 | #endif | |
23 | #endif | |
24 | ||
25 | -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) && !defined(ISRHEL7) | |
26 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) && !defined(ISRHEL7) | |
27 | #include <net/genetlink.h> | |
28 | #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0) | |
29 | #define genl_register_family(a) genl_register_family_with_ops(a, genl_ops, ARRAY_SIZE(genl_ops)) | |
30 | @@ -565,7 +565,7 @@ | |
31 | #define COMPAT_CANNOT_USE_GENL_NOPS | |
32 | #endif | |
33 | ||
34 | -#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 2) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)) || (LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 16) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)) || (LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 65) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)) || (LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 101) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)) || LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 84) | |
35 | +#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 2) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)) || (LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 16) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)) || (LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 65) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)) || (LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 101) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)) || LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 84) | |
36 | #define __COMPAT_NETLINK_DUMP_BLOCK { \ | |
37 | int ret; \ | |
38 | skb->end -= nlmsg_total_size(sizeof(int)); \ | |
39 | @@ -577,7 +577,7 @@ | |
40 | #else | |
41 | #define __COMPAT_NETLINK_DUMP_BLOCK return wg_get_device_dump_real(skb, cb); | |
42 | #endif | |
43 | -#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 8) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)) || (LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 25) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)) || LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 87) | |
44 | +#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 8) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)) || (LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 25) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)) || LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 87) | |
45 | #define wg_get_device_dump(a, b) wg_get_device_dump_real(a, b); \ | |
46 | static int wg_get_device_dump(a, b) { \ | |
47 | struct wg_device *wg = (struct wg_device *)cb->args[0]; \ | |
48 | @@ -1008,7 +1008,7 @@ | |
49 | #define icmpv6_ndo_send __compat_icmpv6_ndo_send | |
50 | #endif | |
51 | ||
52 | -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) | |
53 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) | |
54 | #define COMPAT_CANNOT_USE_MAX_MTU | |
55 | #endif | |
56 |