kernel: bump 6.1 to 6.1.61 (#11637)

Signed-off-by: aakkll <[email protected]>
coolsnowwolf · Nov 4, 2023 · 2e5b2e9 · 2e5b2e9
1 parent 30783ee
commit 2e5b2e9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/include/kernel-6.1 b/include/kernel-6.1
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.1 = .60
-LINUX_KERNEL_HASH-6.1.60 = 58520e7ae5a6af254ddf7ddbfc42e4373b0d36c67d467f6e35a3bd1672f5fb0a
+LINUX_VERSION-6.1 = .61
+LINUX_KERNEL_HASH-6.1.61 = ad2c9d12fc36e2dde4796a3eec8f4ddca2e278098f4e555b6e6f5f03ef6964ce
diff --git a/target/linux/x86/patches-6.1/998-add-a-sysctl-to-enable-disable-tcp_collapse-logic.patch b/target/linux/x86/patches-6.1/998-add-a-sysctl-to-enable-disable-tcp_collapse-logic.patch
@@ -81,15 +81,15 @@ and performance for all other cases.
 
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -5402,6 +5402,7 @@ static bool tcp_prune_ofo_queue(struct s
+@@ -5403,6 +5403,7 @@ static bool tcp_prune_ofo_queue(struct s
  static int tcp_prune_queue(struct sock *sk)
  {
  	struct tcp_sock *tp = tcp_sk(sk);
 +	struct net *net = sock_net(sk);
 
  	NET_INC_STATS(sock_net(sk), LINUX_MIB_PRUNECALLED);
 
-@@ -5413,6 +5414,39 @@ static int tcp_prune_queue(struct sock *
+@@ -5414,6 +5415,39 @@ static int tcp_prune_queue(struct sock *
  	if (atomic_read(&sk->sk_rmem_alloc) <= sk->sk_rcvbuf)
  		return 0;
 
@@ -129,7 +129,7 @@ and performance for all other cases.
  	tcp_collapse_ofo_queue(sk);
  	if (!skb_queue_empty(&sk->sk_receive_queue))
  		tcp_collapse(sk, &sk->sk_receive_queue, NULL,
-@@ -5431,6 +5465,8 @@ static int tcp_prune_queue(struct sock *
+@@ -5432,6 +5466,8 @@ static int tcp_prune_queue(struct sock *
  	if (atomic_read(&sk->sk_rmem_alloc) <= sk->sk_rcvbuf)
  		return 0;