From e70547abca5f6bc2861b1ce1b5e09747c4644c57 Mon Sep 17 00:00:00 2001 From: Chuck Date: Thu, 2 Apr 2020 15:30:31 +0800 Subject: [PATCH] Update add_fullconenat.diff MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 上游代码更新了，apply 的时候有 warning，更新一下 patch --- add_fullconenat.diff | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/add_fullconenat.diff b/add_fullconenat.diff index c9b99df..86c8458 100644 --- a/add_fullconenat.diff +++ b/add_fullconenat.diff @@ -1,20 +1,20 @@ diff --git a/arch/arm64/configs/nanopi-r2_linux_defconfig b/arch/arm64/configs/nanopi-r2_linux_defconfig -index 3f3b7e32f3f2..794537f2a9df 100644 +index 240a9bf57..9f8f37ca7 100644 --- a/arch/arm64/configs/nanopi-r2_linux_defconfig +++ b/arch/arm64/configs/nanopi-r2_linux_defconfig -@@ -1664,3 +1664,4 @@ CONFIG_SCHEDSTATS=y +@@ -1665,3 +1665,4 @@ CONFIG_SCHEDSTATS=y CONFIG_DEBUG_SPINLOCK=y CONFIG_FUNCTION_TRACER=y CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_NETFILTER_XT_TARGET_FULLCONENAT=y diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig -index f17b402111ce..5af7577fd9ff 100644 +index f17b40211..5af7577fd 100644 --- a/net/ipv4/netfilter/Kconfig +++ b/net/ipv4/netfilter/Kconfig @@ -239,6 +239,15 @@ config IP_NF_TARGET_NETMAP (e.g. when running oldconfig). It selects CONFIG_NETFILTER_XT_TARGET_NETMAP. - + +config IP_NF_TARGET_FULLCONENAT + tristate "FULLCONENAT target support" + depends on NETFILTER_ADVANCED @@ -28,13 +28,13 @@ index f17b402111ce..5af7577fd9ff 100644 tristate "REDIRECT target support" depends on NETFILTER_ADVANCED diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig -index 91efae88e8c2..6fd1c3cfdc23 100644 +index 91efae88e..6fd1c3cfd 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -956,6 +956,15 @@ config NETFILTER_XT_TARGET_NETMAP - + To compile it as a module, choose M here. If unsure, say N. - + +config NETFILTER_XT_TARGET_FULLCONENAT + tristate '"FULLCONENAT" target support' + depends on NF_NAT @@ -48,7 +48,7 @@ index 91efae88e8c2..6fd1c3cfdc23 100644 tristate '"NFLOG" target support' default m if NETFILTER_ADVANCED=n diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile -index 4fc075b612fe..eea8bfd0b2bf 100644 +index 4fc075b61..eea8bfd0b 100644 --- a/net/netfilter/Makefile +++ b/net/netfilter/Makefile @@ -209,3 +209,6 @@ obj-$(CONFIG_IP_SET) += ipset/