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/dccp/timer.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/dccp/timer.c')
| -rw-r--r-- | net/dccp/timer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/dccp/timer.c b/net/dccp/timer.c index a4cfb47b60e5..232ac4ae0a73 100644 --- a/net/dccp/timer.c +++ b/net/dccp/timer.c @@ -139,9 +139,9 @@ static void dccp_write_timer(struct timer_list *t) if (sk->sk_state == DCCP_CLOSED || !icsk->icsk_pending) goto out; - if (time_after(icsk->icsk_timeout, jiffies)) { + if (time_after(icsk_timeout(icsk), jiffies)) { sk_reset_timer(sk, &icsk->icsk_retransmit_timer, - icsk->icsk_timeout); + icsk_timeout(icsk)); goto out; } @@ -185,9 +185,9 @@ static void dccp_delack_timer(struct timer_list *t) if (sk->sk_state == DCCP_CLOSED || !(icsk->icsk_ack.pending & ICSK_ACK_TIMER)) goto out; - if (time_after(icsk->icsk_ack.timeout, jiffies)) { + if (time_after(icsk_delack_timeout(icsk), jiffies)) { sk_reset_timer(sk, &icsk->icsk_delack_timer, - icsk->icsk_ack.timeout); + icsk_delack_timeout(icsk)); goto out; } |