package/kernel/nat46/patches/100-kernel-5.4-compat.patch

   1 --- a/nat46/modules/nat46-core.c
   2 +++ b/nat46/modules/nat46-core.c
   3 @@ -17,6 +17,7 @@
   4   */
   5
   6  #include <net/route.h>
   7 +#include <linux/version.h>
   8
   9  #include "nat46-glue.h"
  10  #include "nat46-core.h"
  11 @@ -1601,7 +1602,11 @@ void nat46_ipv6_input(struct sk_buff *ol
  12    /* Remove any debris in the socket control block */
  13    memset(IPCB(new_skb), 0, sizeof(struct inet_skb_parm));
  14    /* Remove netfilter references to IPv6 packet, new netfilter references will be created based on IPv4 packet */
  15 +#if LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0)
  16    nf_reset(new_skb);
  17 +#else
  18 +  nf_reset_ct(new_skb);
  19 +#endif
  20
  21    /* modify packet: actual IPv6->IPv4 transformation */
  22    truncSize = v6packet_l3size - sizeof(struct iphdr); /* chop first 20 bytes */
  23 @@ -1806,7 +1811,11 @@ void nat46_ipv4_input(struct sk_buff *ol
  24    /* Remove any debris in the socket control block */
  25    memset(IPCB(new_skb), 0, sizeof(struct inet_skb_parm));
  26    /* Remove netfilter references to IPv4 packet, new netfilter references will be created based on IPv6 packet */
  27 +#if LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0)
  28    nf_reset(new_skb);
  29 +#else
  30 +  nf_reset_ct(new_skb);
  31 +#endif
  32
  33    /* expand header (add 20 extra bytes at the beginning of sk_buff) */
  34    pskb_expand_head(new_skb, IPV6V4HDRDELTA + (add_frag_header?8:0), 0, GFP_ATOMIC);