aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/kernel/nat46/Makefile6
-rw-r--r--package/kernel/nat46/patches/100-kernel-5.4-compat.patch34
2 files changed, 3 insertions, 37 deletions
diff --git a/package/kernel/nat46/Makefile b/package/kernel/nat46/Makefile
index 0178ade6ab..f37ee6e395 100644
--- a/package/kernel/nat46/Makefile
+++ b/package/kernel/nat46/Makefile
@@ -3,11 +3,11 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=nat46
-PKG_MIRROR_HASH:=24a22c8cb38983b55e7ad55c796f3835aa8702ad6f868953448e3b5e61ab6991
+PKG_MIRROR_HASH:=d0bc80038cadeb7e857118e8d6bae242670ab27377af49f74bad494e0e5da598
PKG_SOURCE_URL:=https://github.com/ayourtch/nat46.git
-PKG_SOURCE_DATE:=2020-07-16
+PKG_SOURCE_DATE:=2020-08-06
PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ac712ad2bedf107329285af1909310675afe872d
+PKG_SOURCE_VERSION:=71e9f0941a666c7010bb6d31d45bb795439038fa
PKG_MAINTAINER:=Hans Dedecker <dedeckeh@gmail.com>
PKG_LICENSE:=GPL-2.0
diff --git a/package/kernel/nat46/patches/100-kernel-5.4-compat.patch b/package/kernel/nat46/patches/100-kernel-5.4-compat.patch
deleted file mode 100644
index 6a638e96b5..0000000000
--- a/package/kernel/nat46/patches/100-kernel-5.4-compat.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/nat46/modules/nat46-core.c
-+++ b/nat46/modules/nat46-core.c
-@@ -17,6 +17,7 @@
- */
-
- #include <net/route.h>
-+#include <linux/version.h>
-
- #include "nat46-glue.h"
- #include "nat46-core.h"
-@@ -1601,7 +1602,11 @@ void nat46_ipv6_input(struct sk_buff *ol
- /* Remove any debris in the socket control block */
- memset(IPCB(new_skb), 0, sizeof(struct inet_skb_parm));
- /* Remove netfilter references to IPv6 packet, new netfilter references will be created based on IPv4 packet */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0)
- nf_reset(new_skb);
-+#else
-+ nf_reset_ct(new_skb);
-+#endif
-
- /* modify packet: actual IPv6->IPv4 transformation */
- truncSize = v6packet_l3size - sizeof(struct iphdr); /* chop first 20 bytes */
-@@ -1806,7 +1811,11 @@ void nat46_ipv4_input(struct sk_buff *ol
- /* Remove any debris in the socket control block */
- memset(IPCB(new_skb), 0, sizeof(struct inet_skb_parm));
- /* Remove netfilter references to IPv4 packet, new netfilter references will be created based on IPv6 packet */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0)
- nf_reset(new_skb);
-+#else
-+ nf_reset_ct(new_skb);
-+#endif
-
- /* expand header (add 20 extra bytes at the beginning of sk_buff) */
- pskb_expand_head(new_skb, IPV6V4HDRDELTA + (add_frag_header?8:0), 0, GFP_ATOMIC);