mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-01-26 19:11:55 +01:00
41 lines
1.8 KiB
Diff
41 lines
1.8 KiB
Diff
From 46a64889071cb844550786096c251b804a234016 Mon Sep 17 00:00:00 2001
|
|
From: Richard Fuchs <rfuchs@sipwise.com>
|
|
Date: Thu, 19 Nov 2020 11:22:26 -0500
|
|
Subject: [PATCH] support kernels >= 5.9.9
|
|
|
|
closes #1111
|
|
|
|
Change-Id: I81f22bfec93b38a108b671b10bd70bf86fb1270c
|
|
---
|
|
kernel-module/xt_RTPENGINE.c | 10 ++++++++--
|
|
1 file changed, 8 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/kernel-module/xt_RTPENGINE.c b/kernel-module/xt_RTPENGINE.c
|
|
index c12edcd83..3c5e3a892 100644
|
|
--- a/kernel-module/xt_RTPENGINE.c
|
|
+++ b/kernel-module/xt_RTPENGINE.c
|
|
@@ -3351,7 +3351,10 @@ static int send_proxy_packet4(struct sk_buff *skb, struct re_address *src, struc
|
|
uh->check = CSUM_MANGLED_0;
|
|
|
|
skb->protocol = htons(ETH_P_IP);
|
|
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,9) || \
|
|
+ (LINUX_VERSION_CODE >= KERNEL_VERSION(5,4,78) && LINUX_VERSION_CODE < KERNEL_VERSION(5,5,0))
|
|
+ if (ip_route_me_harder(par->state->net, par->state->sk, skb, RTN_UNSPEC))
|
|
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
|
|
if (ip_route_me_harder(par->state->net, skb, RTN_UNSPEC))
|
|
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0)
|
|
if (ip_route_me_harder(par->net, skb, RTN_UNSPEC))
|
|
@@ -3447,7 +3450,10 @@ static int send_proxy_packet6(struct sk_buff *skb, struct re_address *src, struc
|
|
uh->check = CSUM_MANGLED_0;
|
|
|
|
skb->protocol = htons(ETH_P_IPV6);
|
|
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,9) || \
|
|
+ (LINUX_VERSION_CODE >= KERNEL_VERSION(5,4,78) && LINUX_VERSION_CODE < KERNEL_VERSION(5,5,0))
|
|
+ if (ip6_route_me_harder(par->state->net, par->state->sk, skb))
|
|
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
|
|
if (ip6_route_me_harder(par->state->net, skb))
|
|
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0)
|
|
if (ip6_route_me_harder(par->net, skb))
|