Re: [PATCH net-next] tcp: rename inet_csk_{delete|reset}_keepalive_timer()

[Joe Damato <jdamato@fastly.com>]

On Thu, Feb 06, 2025 at 09:46:05AM +0000, Eric Dumazet wrote:
> inet_csk_delete_keepalive_timer() and inet_csk_reset_keepalive_timer()
> are only used from core TCP, there is no need to export them.
> 
> Replace their prefix by tcp.
> 
> Move them to net/ipv4/tcp_timer.c and make tcp_delete_keepalive_timer()
> static.
> 
> Signed-off-by: Eric Dumazet <edumazet@google.com>
> ---
>  include/net/inet_connection_sock.h |  3 ---
>  include/net/tcp.h                  |  1 +
>  net/ipv4/inet_connection_sock.c    | 12 ------------
>  net/ipv4/tcp.c                     |  4 ++--
>  net/ipv4/tcp_input.c               |  6 +++---
>  net/ipv4/tcp_minisocks.c           |  3 +--
>  net/ipv4/tcp_timer.c               | 21 +++++++++++++++------
>  7 files changed, 22 insertions(+), 28 deletions(-)

[...]

> diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
> index 0d704bda6c416bd722223eb19bec5667df4e7bb7..4136535cd984d85c615a615f8991ce55ad5af42d 100644
> --- a/net/ipv4/tcp.c
> +++ b/net/ipv4/tcp.c
> @@ -3174,7 +3174,7 @@ void __tcp_close(struct sock *sk, long timeout)
>  			const int tmo = tcp_fin_time(sk);
>  
>  			if (tmo > TCP_TIMEWAIT_LEN) {
> -				inet_csk_reset_keepalive_timer(sk,
> +				tcp_reset_keepalive_timer(sk,
>  						tmo - TCP_TIMEWAIT_LEN);

Extremely minor nit that I hesitate to mention: alignment above seems
odd visually and checkpatch also doesn't like it. I don't think it's
worth resending just for that, though.

Reviewed-by: Joe Damato <jdamato@fastly.com>