aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.10/613-netfilter_optional_tcp_window_check.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2022-04-08 12:35:54 -0400
committerDaniel Golle <daniel@makrotopia.org>2022-04-10 16:31:42 +0100
commit662d1f9f8db3e8bd295dc93b9fd5383741bbadf5 (patch)
tree0d21d15c65fad1201fe2ff0ac08c0937455583e5 /target/linux/generic/pending-5.10/613-netfilter_optional_tcp_window_check.patch
parent40566daa9abc3d07e5d5c1c0c89501f40e4d7f79 (diff)
downloadupstream-662d1f9f8db3e8bd295dc93b9fd5383741bbadf5.tar.gz
upstream-662d1f9f8db3e8bd295dc93b9fd5383741bbadf5.tar.bz2
upstream-662d1f9f8db3e8bd295dc93b9fd5383741bbadf5.zip
kernel: bump 5.10 to 5.10.110
Removed upstreamed: generic/backport-5.10/350-v5.18-MIPS-pgalloc-fix-memory-leak-caused-by-pgd_free.patch generic/pending-5.10/850-0014-PCI-aardvark-Fix-reading-PCI_EXP_RTSTA_PME-bit-on-em.patch ipq40xx/patches-5.10/105-ipq40xx-fix-sleep-clock.patch All patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Compile-/run-tested: ath79/generic (Archer C7 v2). Signed-off-by: Daniel Golle <daniel@makrotopia.org> [rebased in 22.03 tree] Signed-off-by: John Audia <graysky@archlinux.us> (cherry picked from commit b92ec82235b996ece32bc84af177adf1a4dcb90e)
Diffstat (limited to 'target/linux/generic/pending-5.10/613-netfilter_optional_tcp_window_check.patch')
-rw-r--r--target/linux/generic/pending-5.10/613-netfilter_optional_tcp_window_check.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/pending-5.10/613-netfilter_optional_tcp_window_check.patch b/target/linux/generic/pending-5.10/613-netfilter_optional_tcp_window_check.patch
index 97e449510d..4cf07a3e2c 100644
--- a/target/linux/generic/pending-5.10/613-netfilter_optional_tcp_window_check.patch
+++ b/target/linux/generic/pending-5.10/613-netfilter_optional_tcp_window_check.patch
@@ -28,7 +28,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/*
* Get the required data from the packet.
*/
-@@ -1130,7 +1136,7 @@ int nf_conntrack_tcp_packet(struct nf_co
+@@ -1139,7 +1145,7 @@ int nf_conntrack_tcp_packet(struct nf_co
IP_CT_TCP_FLAG_DATA_UNACKNOWLEDGED &&
timeouts[new_state] > timeouts[TCP_CONNTRACK_UNACK])
timeout = timeouts[TCP_CONNTRACK_UNACK];