diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2016-10-04 21:52:26 +0200 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2016-10-04 21:52:26 +0200 |
commit | e526119400f66a6487bad9c37897f1a357ec937d (patch) | |
tree | 5d2a01d4df95eb337d7ccc78e24625e7adc4cc3a | |
parent | send: only avoid parallel path when there aren't inflight jobs (diff) | |
download | wireguard-monolithic-historical-e526119400f66a6487bad9c37897f1a357ec937d.tar.xz wireguard-monolithic-historical-e526119400f66a6487bad9c37897f1a357ec937d.zip |
compat: akpm merged this to 4.9
http://marc.info/?l=linux-mm-commits&m=147553169709478&w=2
-rw-r--r-- | src/compat.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compat.h b/src/compat.h index 68c56e3..8759254 100644 --- a/src/compat.h +++ b/src/compat.h @@ -116,11 +116,12 @@ __attribute__((unused)) static inline int udp_sock_create_new(struct net *net, s #define IP6_ECN_set_ce(a, b) IP6_ECN_set_ce(b) #endif -/* https://lkml.org/lkml/2016/9/28/904 */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) #define time_is_before_jiffies64(a) time_after64(get_jiffies_64(), a) #define time_is_after_jiffies64(a) time_before64(get_jiffies_64(), a) #define time_is_before_eq_jiffies64(a) time_after_eq64(get_jiffies_64(), a) #define time_is_after_eq_jiffies64(a) time_before_eq64(get_jiffies_64(), a) +#endif /* https://lkml.org/lkml/2015/6/12/415 */ #include <linux/netdevice.h> |