From b66437622fd87d9c80c178bf5894af02ff215cb0 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Thu, 19 Nov 2020 11:22:26 -0500 Subject: [PATCH] TT#104400 support kernels >= 5.9.9 closes #1111 Change-Id: I81f22bfec93b38a108b671b10bd70bf86fb1270c (cherry picked from commit 708b48643bc4847f03bd1b1782d639571c0c83a7) --- 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 46f975061..32110804b 100644 --- a/kernel-module/xt_RTPENGINE.c +++ b/kernel-module/xt_RTPENGINE.c @@ -3293,7 +3293,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)) @@ -3389,7 +3392,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))