diff options
| author | Cristian Ciocaltea <cristian.ciocaltea@collabora.com> | 2023-09-15 19:15:49 +0300 |
|---|---|---|
| committer | Cristian Ciocaltea <cristian.ciocaltea@collabora.com> | 2023-09-15 19:15:49 +0300 |
| commit | 59d13e5509deb9d4606a86b3bd8e7b1b3b4fcf6a (patch) | |
| tree | d8a8bd0527915f7143d175dcb5e28dcde9586eea /net | |
| parent | cdd69777f59ed04bff40e11728ebf844d0b820e9 (diff) | |
| parent | ef76035f50a1147a0d39b3d9c1b80b92a2961028 (diff) | |
| download | linux-59d13e5509deb9d4606a86b3bd8e7b1b3b4fcf6a.tar.gz | |
Merge branch 6.1/features/tcp-timewait
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/tcp_minisocks.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c index 42844d20da02..607d4258416d 100644 --- a/net/ipv4/tcp_minisocks.c +++ b/net/ipv4/tcp_minisocks.c @@ -142,7 +142,7 @@ tcp_timewait_state_process(struct inet_timewait_sock *tw, struct sk_buff *skb, tcptw->tw_ts_recent = tmp_opt.rcv_tsval; } - inet_twsk_reschedule(tw, TCP_TIMEWAIT_LEN); + inet_twsk_reschedule(tw, tcp_timewait_len(tw)); return TCP_TW_ACK; } @@ -179,7 +179,7 @@ kill: return TCP_TW_SUCCESS; } } else { - inet_twsk_reschedule(tw, TCP_TIMEWAIT_LEN); + inet_twsk_reschedule(tw, tcp_timewait_len(tw)); } if (tmp_opt.saw_tstamp) { @@ -230,7 +230,7 @@ kill: * Do not reschedule in the last case. */ if (paws_reject || th->ack) - inet_twsk_reschedule(tw, TCP_TIMEWAIT_LEN); + inet_twsk_reschedule(tw, tcp_timewait_len(tw)); return tcp_timewait_check_oow_rate_limit( tw, skb, LINUX_MIB_TCPACKSKIPPEDTIMEWAIT); @@ -308,7 +308,7 @@ void tcp_time_wait(struct sock *sk, int state, int timeo) timeo = rto; if (state == TCP_TIME_WAIT) - timeo = TCP_TIMEWAIT_LEN; + timeo = tcp_timewait_len(tw); /* tw_timer is pinned, so we need to make sure BH are disabled * in following section, otherwise timer handler could run before |