aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.4/613-netfilter_optional_tcp_window_check.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2021-04-24 01:01:21 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2021-05-02 14:32:27 +0200
commit438718b5fbdb4f597a1f779600aa61417b13f84a (patch)
treee59a2b0e137408b691921c15c3ca067de4ae84b3 /target/linux/generic/pending-5.4/613-netfilter_optional_tcp_window_check.patch
parentd57e4803940b97c06cbb8c659dd6de907cdd90ec (diff)
downloadupstream-438718b5fbdb4f597a1f779600aa61417b13f84a.tar.gz
upstream-438718b5fbdb4f597a1f779600aa61417b13f84a.tar.bz2
upstream-438718b5fbdb4f597a1f779600aa61417b13f84a.zip
kernel: bump 5.4 to 5.4.114
Removed because in upstream* mvebu/patches-5.4/319-ARM-dts-turris-omnia-configure-LED-2--INTn-pin-as-interrupt-pin.patch Manually rebased* generic/backport-5.4/700-v5.5-net-core-allow-fast-GRO-for-skbs-with-Ethernet-heade.patch Added new backport* generic/backport-5.4/050-gro-fix-napi_gro_frags-Fast-GRO-breakage-due-to-IP-a.patch All others updated automatically. The new backport was included based on this[1] upstream commit that will be mainlined soon. This change is needed because Eric Dumazet's check for NET_IP_ALIGN (landed in 5.4.114) causes huge slowdowns on drivers which use napi_gro_frags(). Compile-tested on: x86/64, armvirt/64, ath79/generic Runtime-tested on: x86/64, armvirt/64, ath79/generic Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-5.4/613-netfilter_optional_tcp_window_check.patch')
-rw-r--r--target/linux/generic/pending-5.4/613-netfilter_optional_tcp_window_check.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-5.4/613-netfilter_optional_tcp_window_check.patch b/target/linux/generic/pending-5.4/613-netfilter_optional_tcp_window_check.patch
index 2881337724..0735f8d20d 100644
--- a/target/linux/generic/pending-5.4/613-netfilter_optional_tcp_window_check.patch
+++ b/target/linux/generic/pending-5.4/613-netfilter_optional_tcp_window_check.patch
@@ -49,7 +49,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
static bool enable_hooks __read_mostly;
MODULE_PARM_DESC(enable_hooks, "Always enable conntrack hooks");
module_param(enable_hooks, bool, 0000);
-@@ -649,6 +652,7 @@ enum nf_ct_sysctl_index {
+@@ -650,6 +653,7 @@ enum nf_ct_sysctl_index {
NF_SYSCTL_CT_PROTO_TIMEOUT_GRE_STREAM,
#endif
@@ -57,7 +57,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
__NF_SYSCTL_CT_LAST_SYSCTL,
};
-@@ -975,6 +979,13 @@ static struct ctl_table nf_ct_sysctl_tab
+@@ -976,6 +980,13 @@ static struct ctl_table nf_ct_sysctl_tab
.proc_handler = proc_dointvec_jiffies,
},
#endif