aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/compat
diff options
context:
space:
mode:
authorNathan Chancellor <natechancellor@gmail.com>2019-08-24 22:37:50 -0700
committerJason A. Donenfeld <Jason@zx2c4.com>2019-08-25 11:02:19 -0600
commita96f9d3c1207e8df50ecfe5f86f88a5c776e72e3 (patch)
treef98da9140ad61b319c001003ea410ff332839009 /src/compat
parentwg-quick: openbsd: fix alternate routing table syntax (diff)
downloadwireguard-monolithic-historical-a96f9d3c1207e8df50ecfe5f86f88a5c776e72e3.tar.xz
wireguard-monolithic-historical-a96f9d3c1207e8df50ecfe5f86f88a5c776e72e3.zip
compat: account for android-4.9 backport of addr_gen_mode
Android kernels backported d35a00b8e33dab7385f724e713ae71c8be0a49f4, so now we need to do feature detection. Link: https://android-review.googlesource.com/c/kernel/common/+/1103831 Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Diffstat (limited to 'src/compat')
-rw-r--r--src/compat/Kbuild.include4
-rw-r--r--src/compat/compat.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/compat/Kbuild.include b/src/compat/Kbuild.include
index 7404992..db4b0a6 100644
--- a/src/compat/Kbuild.include
+++ b/src/compat/Kbuild.include
@@ -47,6 +47,10 @@ ccflags-y += -include $(kbuild-dir)/compat/memneq/include.h
wireguard-y += compat/memneq/memneq.o
endif
+ifeq ($(shell grep -s -F "addr_gen_mode" "$(srctree)/include/linux/ipv6.h"),)
+ccflags-y += -DCOMPAT_CANNOT_USE_DEV_CNF
+endif
+
ifdef CONFIG_HZ
ifeq ($(wildcard $(srctree)/include/generated/timeconst.h),)
ccflags-y += $(shell echo 'define gcd(a,b){auto t;while(b){t=b;b=a%b;a=t;};return a;};hz=$(CONFIG_HZ);cd=gcd(hz,1000000);print "-DHZ_TO_USEC_NUM=",1000000/cd," -DHZ_TO_USEC_DEN=",hz/cd;halt;' | bc -q)
diff --git a/src/compat/compat.h b/src/compat/compat.h
index c98d623..fb09037 100644
--- a/src/compat/compat.h
+++ b/src/compat/compat.h
@@ -600,10 +600,6 @@ static int wg_get_device_dump_real(a, b)
#define COMPAT_CANNOT_USE_IN6_DEV_GET
#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
-#define COMPAT_CANNOT_USE_DEV_CNF
-#endif
-
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
#define COMPAT_CANNOT_USE_IFF_NO_QUEUE
#endif