aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-5.4/250-netfilter_depends.patch
diff options
context:
space:
mode:
authorRui Salvaterra <rsalvaterra@gmail.com>2021-04-08 23:57:48 +0100
committerKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>2021-04-22 09:11:14 +0100
commit6f053e5b4f65080a476541bb45c4781f38f9411f (patch)
tree9a6bd8aa9a1f9f644a4dad52804cd72b9d3a9ef9 /target/linux/generic/hack-5.4/250-netfilter_depends.patch
parent15cd9a5d5ced0da521895e0758da56b7d85d92ab (diff)
downloadupstream-6f053e5b4f65080a476541bb45c4781f38f9411f.tar.gz
upstream-6f053e5b4f65080a476541bb45c4781f38f9411f.tar.bz2
upstream-6f053e5b4f65080a476541bb45c4781f38f9411f.zip
kernel: drop the conntrack rtcache patch
It's in backports-5.4, but it wasn't ever merged. Upstream followed another approach, with flow offloading, which has much better performance. Drop this obsolete patch and refresh the kernel patches. Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> Acked-by: Stijn Tintel <stijn@linux-ipv6.be> Acked-by: Felix Fietkau <nbd@nbd.name> (cherry picked from commit 17576b1b2aeacf0a23bb9a911d675bd324754745)
Diffstat (limited to 'target/linux/generic/hack-5.4/250-netfilter_depends.patch')
-rw-r--r--target/linux/generic/hack-5.4/250-netfilter_depends.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/hack-5.4/250-netfilter_depends.patch b/target/linux/generic/hack-5.4/250-netfilter_depends.patch
index 512e58efcf..d03cb53180 100644
--- a/target/linux/generic/hack-5.4/250-netfilter_depends.patch
+++ b/target/linux/generic/hack-5.4/250-netfilter_depends.patch
@@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
-@@ -240,7 +240,6 @@ config NF_CONNTRACK_FTP
+@@ -228,7 +228,6 @@ config NF_CONNTRACK_FTP
config NF_CONNTRACK_H323
tristate "H.323 protocol support"
@@ -17,7 +17,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
depends on NETFILTER_ADVANCED
help
H.323 is a VoIP signalling protocol from ITU-T. As one of the most
-@@ -1100,7 +1099,6 @@ config NETFILTER_XT_TARGET_SECMARK
+@@ -1088,7 +1087,6 @@ config NETFILTER_XT_TARGET_SECMARK
config NETFILTER_XT_TARGET_TCPMSS
tristate '"TCPMSS" target support'