Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57935355 authored by Eric Dumazet's avatar Eric Dumazet Committed by Greg Kroah-Hartman
Browse files

tcp: tcp_enter_quickack_mode() should be static 



[ Upstream commit 03b123debcbc8db987bda17ed8412cc011064c22 ]

After commit d2ccd7bc ("tcp: avoid resetting ACK timer in DCTCP"),
tcp_enter_quickack_mode() is only used from net/ipv4/tcp_input.c.

Fixes: d2ccd7bc ("tcp: avoid resetting ACK timer in DCTCP")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Yuchung Cheng <ycheng@google.com>
Cc: Neal Cardwell <ncardwell@google.com>
Link: https://lore.kernel.org/r/20230718162049.1444938-1-edumazet@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 75b8b5b5

include/net/tcp.h

+0 −1
Original line number Diff line number Diff line
@@ -343,7 +343,6 @@ ssize_t tcp_splice_read(struct socket *sk, loff_t *ppos, 
			struct pipe_inode_info *pipe, size_t len,

			unsigned int flags);



void tcp_enter_quickack_mode(struct sock *sk, unsigned int max_quickacks);

static inline void tcp_dec_quickack_mode(struct sock *sk,

					 const unsigned int pkts)

{

net/ipv4/tcp_input.c

+1 −2
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ static void tcp_incr_quickack(struct sock *sk, unsigned int max_quickacks) 
		icsk->icsk_ack.quick = quickacks;

}



void tcp_enter_quickack_mode(struct sock *sk, unsigned int max_quickacks)

static void tcp_enter_quickack_mode(struct sock *sk, unsigned int max_quickacks)

{

	struct inet_connection_sock *icsk = inet_csk(sk);
@@ -230,7 +230,6 @@ void tcp_enter_quickack_mode(struct sock *sk, unsigned int max_quickacks) 
	inet_csk_exit_pingpong_mode(sk);

	icsk->icsk_ack.ato = TCP_ATO_MIN;

}

EXPORT_SYMBOL(tcp_enter_quickack_mode);



/* Send ACKs quickly, if "quick" count is not exhausted

 * and the session is not interactive.