From bdbab13326b1794fc7f1a9a4fea073e12228e303 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 16 Jul 2024 09:08:23 +0200 Subject: [PATCH] fix up queue-4.19/tcp-refactor-tcp_retransmit_timer.patch --- queue-4.19/tcp-refactor-tcp_retransmit_timer.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/queue-4.19/tcp-refactor-tcp_retransmit_timer.patch b/queue-4.19/tcp-refactor-tcp_retransmit_timer.patch index 72bf6c7d563..7d590a0d719 100644 --- a/queue-4.19/tcp-refactor-tcp_retransmit_timer.patch +++ b/queue-4.19/tcp-refactor-tcp_retransmit_timer.patch @@ -30,14 +30,14 @@ Signed-off-by: Greg Kroah-Hartman --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c -@@ -391,6 +391,7 @@ static void tcp_fastopen_synack_timer(st - int max_retries = icsk->icsk_syn_retries ? : - sock_net(sk)->ipv4.sysctl_tcp_synack_retries + 1; /* add one more retry for fastopen */ - struct request_sock *req; +@@ -428,6 +428,7 @@ void tcp_retransmit_timer(struct sock *s + struct tcp_sock *tp = tcp_sk(sk); + struct net *net = sock_net(sk); + struct inet_connection_sock *icsk = inet_csk(sk); + struct sk_buff *skb; - req = tcp_sk(sk)->fastopen_rsk; - req->rsk_ops->syn_ack_timeout(req); + if (tp->fastopen_rsk) { + WARN_ON_ONCE(sk->sk_state != TCP_SYN_RECV && @@ -438,7 +439,12 @@ void tcp_retransmit_timer(struct sock *s */ return; -- 2.47.3