diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2025-03-25 10:34:35 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2025-03-25 10:34:35 -0700 |
| commit | 071ccde6e511e3d82dfcc6d9caf40155a33d7428 (patch) | |
| tree | 0df97cbda7cbbed78470b7f8b13fedec9651b50b /net/ipv4/tcp_output.c | |
| parent | 7bd2e6b74ad56a49459ba84e8d4fa3730055ab5e (diff) | |
| parent | f1e30061e8a5af48c91ef2f25762f792114a6a90 (diff) | |
Merge branch 'tcp-dccp-remove-16-bytes-from-icsk'
Eric Dumazet says:
====================
tcp/dccp: remove 16 bytes from icsk
icsk->icsk_timeout and icsk->icsk_ack.timeout can be removed.
They mirror existing fields in icsk->icsk_retransmit_timer and
icsk->icsk_retransmit_timer.
====================
Link: https://patch.msgid.link/20250324203607.703850-1-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/ipv4/tcp_output.c')
| -rw-r--r-- | net/ipv4/tcp_output.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 9a6061017114..13295a59d22e 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -4225,17 +4225,16 @@ void tcp_send_delayed_ack(struct sock *sk) /* Use new timeout only if there wasn't a older one earlier. */ if (icsk->icsk_ack.pending & ICSK_ACK_TIMER) { /* If delack timer is about to expire, send ACK now. */ - if (time_before_eq(icsk->icsk_ack.timeout, jiffies + (ato >> 2))) { + if (time_before_eq(icsk_delack_timeout(icsk), jiffies + (ato >> 2))) { tcp_send_ack(sk); return; } - if (!time_before(timeout, icsk->icsk_ack.timeout)) - timeout = icsk->icsk_ack.timeout; + if (!time_before(timeout, icsk_delack_timeout(icsk))) + timeout = icsk_delack_timeout(icsk); } smp_store_release(&icsk->icsk_ack.pending, icsk->icsk_ack.pending | ICSK_ACK_SCHED | ICSK_ACK_TIMER); - icsk->icsk_ack.timeout = timeout; sk_reset_timer(sk, &icsk->icsk_delack_timer, timeout); } |