* [PATCH 1/1] queueing: skb_reset_redirect change has been backported to 5.[45]
@ 2020-04-01 16:32 Christian Hesse
2020-04-01 19:11 ` Jason A. Donenfeld
0 siblings, 1 reply; 2+ messages in thread
From: Christian Hesse @ 2020-04-01 16:32 UTC (permalink / raw)
To: WireGuard mailing list; +Cc: Christian Hesse
From: Christian Hesse <mail@eworm.de>
This is a follow up to 2d4fa2a6e7903ec3340f1b075456cbd84ba6a744.
Upstream commit 2c64605b590edadb3fb46d1ec6badb49e940b479 has been backported
to 5.4.29 and 5.5.14.
Signed-off-by: Christian Hesse <mail@eworm.de>
---
src/compat/compat.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/compat/compat.h b/src/compat/compat.h
index fe2d07e..7f16332 100644
--- a/src/compat/compat.h
+++ b/src/compat/compat.h
@@ -1024,7 +1024,8 @@ out:
#define COMPAT_CANNOT_USE_MAX_MTU
#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 29) || \
+ (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 14)))
#include <linux/skbuff.h>
static inline void skb_reset_redirect(struct sk_buff *skb)
{
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH 1/1] queueing: skb_reset_redirect change has been backported to 5.[45]
2020-04-01 16:32 [PATCH 1/1] queueing: skb_reset_redirect change has been backported to 5.[45] Christian Hesse
@ 2020-04-01 19:11 ` Jason A. Donenfeld
0 siblings, 0 replies; 2+ messages in thread
From: Jason A. Donenfeld @ 2020-04-01 19:11 UTC (permalink / raw)
To: Christian Hesse; +Cc: WireGuard mailing list, Christian Hesse
Applied and released, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-04-01 19:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-01 16:32 [PATCH 1/1] queueing: skb_reset_redirect change has been backported to 5.[45] Christian Hesse
2020-04-01 19:11 ` Jason A. Donenfeld
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).