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

Commit 24901551 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

tcp: remove in_flight parameter from cong_avoid() methods 



Commit e114a710 ("tcp: fix cwnd limited checking to improve
congestion control") obsoleted in_flight parameter from
tcp_is_cwnd_limited() and its callers.

This patch does the removal as promised.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Acked-by: default avatarNeal Cardwell <ncardwell@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e114a710

include/net/tcp.h

+3 −5
Original line number Diff line number Diff line
@@ -796,7 +796,7 @@ struct tcp_congestion_ops { 
	/* return slow start threshold (required) */

	u32 (*ssthresh)(struct sock *sk);

	/* do new cwnd calculation (required) */

	void (*cong_avoid)(struct sock *sk, u32 ack, u32 acked, u32 in_flight);

	void (*cong_avoid)(struct sock *sk, u32 ack, u32 acked);

	/* call before changing ca_state (optional) */

	void (*set_state)(struct sock *sk, u8 new_state);

	/* call when cwnd event occurs (optional) */
@@ -828,7 +828,7 @@ void tcp_cong_avoid_ai(struct tcp_sock *tp, u32 w); 


extern struct tcp_congestion_ops tcp_init_congestion_ops;

u32 tcp_reno_ssthresh(struct sock *sk);

void tcp_reno_cong_avoid(struct sock *sk, u32 ack, u32 acked, u32 in_flight);

void tcp_reno_cong_avoid(struct sock *sk, u32 ack, u32 acked);

extern struct tcp_congestion_ops tcp_reno;



static inline void tcp_set_ca_state(struct sock *sk, const u8 ca_state)
@@ -986,10 +986,8 @@ static inline u32 tcp_wnd_end(const struct tcp_sock *tp) 
 * risks 100% overshoot. The advantage is that we discourage application to

 * either send more filler packets or data to artificially blow up the cwnd

 * usage, and allow application-limited process to probe bw more aggressively.

 *

 * TODO: remove in_flight once we can fix all callers, and their callers...

 */

static inline bool tcp_is_cwnd_limited(const struct sock *sk, u32 in_flight)

static inline bool tcp_is_cwnd_limited(const struct sock *sk)

{

	const struct tcp_sock *tp = tcp_sk(sk);

net/ipv4/tcp_bic.c

+2 −3
Original line number Diff line number Diff line
@@ -140,13 +140,12 @@ static inline void bictcp_update(struct bictcp *ca, u32 cwnd) 
		ca->cnt = 1;

}



static void bictcp_cong_avoid(struct sock *sk, u32 ack, u32 acked,

			      u32 in_flight)

static void bictcp_cong_avoid(struct sock *sk, u32 ack, u32 acked)

{

	struct tcp_sock *tp = tcp_sk(sk);

	struct bictcp *ca = inet_csk_ca(sk);



	if (!tcp_is_cwnd_limited(sk, in_flight))

	if (!tcp_is_cwnd_limited(sk))

		return;



	if (tp->snd_cwnd <= tp->snd_ssthresh)

net/ipv4/tcp_cong.c

+2 −2
Original line number Diff line number Diff line
@@ -317,11 +317,11 @@ EXPORT_SYMBOL_GPL(tcp_cong_avoid_ai); 
/* This is Jacobson's slow start and congestion avoidance.

 * SIGCOMM '88, p. 328.

 */

void tcp_reno_cong_avoid(struct sock *sk, u32 ack, u32 acked, u32 in_flight)

void tcp_reno_cong_avoid(struct sock *sk, u32 ack, u32 acked)

{

	struct tcp_sock *tp = tcp_sk(sk);



	if (!tcp_is_cwnd_limited(sk, in_flight))

	if (!tcp_is_cwnd_limited(sk))

		return;



	/* In "safe" area, increase. */

net/ipv4/tcp_cubic.c

+2 −3
Original line number Diff line number Diff line
@@ -304,13 +304,12 @@ static inline void bictcp_update(struct bictcp *ca, u32 cwnd) 
		ca->cnt = 1;

}



static void bictcp_cong_avoid(struct sock *sk, u32 ack, u32 acked,

			      u32 in_flight)

static void bictcp_cong_avoid(struct sock *sk, u32 ack, u32 acked)

{

	struct tcp_sock *tp = tcp_sk(sk);

	struct bictcp *ca = inet_csk_ca(sk);



	if (!tcp_is_cwnd_limited(sk, in_flight))

	if (!tcp_is_cwnd_limited(sk))

		return;



	if (tp->snd_cwnd <= tp->snd_ssthresh) {

net/ipv4/tcp_highspeed.c

+2 −2
Original line number Diff line number Diff line
@@ -109,12 +109,12 @@ static void hstcp_init(struct sock *sk) 
	tp->snd_cwnd_clamp = min_t(u32, tp->snd_cwnd_clamp, 0xffffffff/128);

}



static void hstcp_cong_avoid(struct sock *sk, u32 ack, u32 acked, u32 in_flight)

static void hstcp_cong_avoid(struct sock *sk, u32 ack, u32 acked)

{

	struct tcp_sock *tp = tcp_sk(sk);

	struct hstcp *ca = inet_csk_ca(sk);



	if (!tcp_is_cwnd_limited(sk, in_flight))

	if (!tcp_is_cwnd_limited(sk))

		return;



	if (tp->snd_cwnd <= tp->snd_ssthresh)