From 84c7916464379a82d130bd454b08d67ed7ecdca9 Mon Sep 17 00:00:00 2001 From: aakkll <94471752+aakkll@users.noreply.github.com> Date: Fri, 16 Sep 2022 02:10:53 +0800 Subject: [PATCH] kernel: bump 5.19 to 5.19.9 (#10125) Signed-off-by: aakkll <94471752+aakkll@users.noreply.github.com> Signed-off-by: aakkll <94471752+aakkll@users.noreply.github.com> --- include/kernel-5.19 | 4 ++-- .../613-netfilter_optional_tcp_window_check.patch | 4 ++-- target/linux/generic/pending-5.19/655-increase_skb_pad.patch | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/kernel-5.19 b/include/kernel-5.19 index 8f3128bb4..bc8d3d272 100644 --- a/include/kernel-5.19 +++ b/include/kernel-5.19 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.19 = .8 -LINUX_KERNEL_HASH-5.19.8 = 616308795a952a6a39b4c74807c33916850eb7166d8ed7c9a87a1ba55d7487ce +LINUX_VERSION-5.19 = .9 +LINUX_KERNEL_HASH-5.19.9 = 0ad5b5986693adc1962be807bc3a64423a24b6a9da9df39b259d7e3bfd927f37 diff --git a/target/linux/generic/pending-5.19/613-netfilter_optional_tcp_window_check.patch b/target/linux/generic/pending-5.19/613-netfilter_optional_tcp_window_check.patch index 7fa3d900c..328440f4f 100644 --- a/target/linux/generic/pending-5.19/613-netfilter_optional_tcp_window_check.patch +++ b/target/linux/generic/pending-5.19/613-netfilter_optional_tcp_window_check.patch @@ -19,7 +19,7 @@ Signed-off-by: Christian 'Ansuel' Marangi /* * Get the required data from the packet. */ -@@ -1130,7 +1133,7 @@ int nf_conntrack_tcp_packet(struct nf_co +@@ -1161,7 +1164,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]; @@ -28,7 +28,7 @@ Signed-off-by: Christian 'Ansuel' Marangi timeouts[new_state] > timeouts[TCP_CONNTRACK_RETRANS]) timeout = timeouts[TCP_CONNTRACK_RETRANS]; else -@@ -1446,6 +1449,9 @@ void nf_conntrack_tcp_init_net(struct ne +@@ -1477,6 +1480,9 @@ void nf_conntrack_tcp_init_net(struct ne */ tn->tcp_be_liberal = 0; diff --git a/target/linux/generic/pending-5.19/655-increase_skb_pad.patch b/target/linux/generic/pending-5.19/655-increase_skb_pad.patch index 81367e1ee..a6c5a35e1 100644 --- a/target/linux/generic/pending-5.19/655-increase_skb_pad.patch +++ b/target/linux/generic/pending-5.19/655-increase_skb_pad.patch @@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -3096,7 +3096,7 @@ static inline int pskb_network_may_pull( +@@ -3123,7 +3123,7 @@ static inline int pskb_network_may_pull( * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8) */ #ifndef NET_SKB_PAD