diff options
| author | Eric Dumazet <[email protected]> | 2025-03-24 20:36:06 +0000 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2025-03-25 17:34:33 +0000 |
| commit | a7c428ee8f59f171a3b57474f2bd5cee0ef1e036 (patch) | |
| tree | eb9c5084bf507d88a633ef4b6048bd8a65fe44a5 /net/ipv4/tcp_ipv4.c | |
| parent | Merge branch 'net-skip-taking-rtnl_lock-for-queue-get' (diff) | |
| download | kernel-a7c428ee8f59f171a3b57474f2bd5cee0ef1e036.tar.gz kernel-a7c428ee8f59f171a3b57474f2bd5cee0ef1e036.zip | |
tcp/dccp: remove icsk->icsk_timeout
icsk->icsk_timeout can be replaced by icsk->icsk_retransmit_timer.expires
This saves 8 bytes in TCP/DCCP sockets and helps for better cache locality.
Signed-off-by: Eric Dumazet <[email protected]>
Reviewed-by: Kuniyuki Iwashima <[email protected]>
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 1cd0938d47e0..8cce0d5489da 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -2923,10 +2923,10 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i) icsk_pending == ICSK_TIME_REO_TIMEOUT || icsk_pending == ICSK_TIME_LOSS_PROBE) { timer_active = 1; - timer_expires = icsk->icsk_timeout; + timer_expires = icsk_timeout(icsk); } else if (icsk_pending == ICSK_TIME_PROBE0) { timer_active = 4; - timer_expires = icsk->icsk_timeout; + timer_expires = icsk_timeout(icsk); } else if (timer_pending(&sk->sk_timer)) { timer_active = 2; timer_expires = sk->sk_timer.expires; |