yanistyle/nanopi-openwrt-r1s-h3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update add_fullconenat.diff

Browse Source 
上游代码更新了，apply 的时候有 warning，更新一下 patch
This commit is contained in:
Chuck
2020-04-02 15:30:31 +08:00
committed by GitHub
parent 6dfeb67c3a
commit e70547abca
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
add_fullconenat.diff
View File

@@ -1,14 +1,14 @@
diff --git a/arch/arm64/configs/nanopi-r2_linux_defconfig b/arch/arm64/configs/nanopi-r2_linux_defconfig 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 --- a/arch/arm64/configs/nanopi-r2_linux_defconfig
+++ b/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_DEBUG_SPINLOCK=y
CONFIG_FUNCTION_TRACER=y CONFIG_FUNCTION_TRACER=y
CONFIG_BLK_DEV_IO_TRACE=y CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_NETFILTER_XT_TARGET_FULLCONENAT=y +CONFIG_NETFILTER_XT_TARGET_FULLCONENAT=y
diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig 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 --- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig +++ b/net/ipv4/netfilter/Kconfig
@@ -239,6 +239,15 @@ config IP_NF_TARGET_NETMAP @@ -239,6 +239,15 @@ config IP_NF_TARGET_NETMAP
@@ -28,7 +28,7 @@ index f17b402111ce..5af7577fd9ff 100644
tristate "REDIRECT target support" tristate "REDIRECT target support"
depends on NETFILTER_ADVANCED depends on NETFILTER_ADVANCED
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 91efae88e8c2..6fd1c3cfdc23 100644 index 91efae88e..6fd1c3cfd 100644
--- a/net/netfilter/Kconfig --- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig
@@ -956,6 +956,15 @@ config NETFILTER_XT_TARGET_NETMAP @@ -956,6 +956,15 @@ config NETFILTER_XT_TARGET_NETMAP
@@ -48,7 +48,7 @@ index 91efae88e8c2..6fd1c3cfdc23 100644
tristate '"NFLOG" target support' tristate '"NFLOG" target support'
default m if NETFILTER_ADVANCED=n default m if NETFILTER_ADVANCED=n
diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
index 4fc075b612fe..eea8bfd0b2bf 100644 index 4fc075b61..eea8bfd0b 100644
--- a/net/netfilter/Makefile --- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile +++ b/net/netfilter/Makefile
@@ -209,3 +209,6 @@ obj-$(CONFIG_IP_SET) += ipset/ @@ -209,3 +209,6 @@ obj-$(CONFIG_IP_SET) += ipset/