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

Commit 16751347 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

[TCP]: remove unused argument to cong_avoid op 



None of the existing TCP congestion controls use the rtt value pased
in the ca_ops->cong_avoid interface.  Which is lucky because seq_rtt
could have been -1 when handling a duplicate ack.

Signed-off-by: default avatarStephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 44beac00

include/net/tcp.h

+2 −4
Original line number Diff line number Diff line
@@ -652,8 +652,7 @@ struct tcp_congestion_ops { 
	/* lower bound for congestion window (optional) */

	u32 (*min_cwnd)(const struct sock *sk);

	/* do new cwnd calculation (required) */

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

			   u32 rtt, u32 in_flight, int good_ack);

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

	/* call before changing ca_state (optional) */

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

	/* call when cwnd event occurs (optional) */
@@ -684,8 +683,7 @@ extern void tcp_slow_start(struct tcp_sock *tp); 


extern struct tcp_congestion_ops tcp_init_congestion_ops;

extern u32 tcp_reno_ssthresh(struct sock *sk);

extern void tcp_reno_cong_avoid(struct sock *sk, u32 ack,

				u32 rtt, u32 in_flight, int flag);

extern void tcp_reno_cong_avoid(struct sock *sk, u32 ack, u32 in_flight, int flag);

extern u32 tcp_reno_min_cwnd(const struct sock *sk);

extern struct tcp_congestion_ops tcp_reno;

net/ipv4/tcp_bic.c

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static inline void bictcp_update(struct bictcp *ca, u32 cwnd) 
}



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

			      u32 seq_rtt, u32 in_flight, int data_acked)

			      u32 in_flight, int data_acked)

{

	struct tcp_sock *tp = tcp_sk(sk);

	struct bictcp *ca = inet_csk_ca(sk);

net/ipv4/tcp_cong.c

+1 −2
Original line number Diff line number Diff line
@@ -324,8 +324,7 @@ EXPORT_SYMBOL_GPL(tcp_slow_start); 
/* This is Jacobson's slow start and congestion avoidance.

 * SIGCOMM '88, p. 328.

 */

void tcp_reno_cong_avoid(struct sock *sk, u32 ack, u32 rtt, u32 in_flight,

			 int flag)

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

{

	struct tcp_sock *tp = tcp_sk(sk);

net/ipv4/tcp_cubic.c

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ static inline void measure_delay(struct sock *sk) 
}



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

			      u32 seq_rtt, u32 in_flight, int data_acked)

			      u32 in_flight, int data_acked)

{

	struct tcp_sock *tp = tcp_sk(sk);

	struct bictcp *ca = inet_csk_ca(sk);

net/ipv4/tcp_highspeed.c

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ 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 adk, u32 rtt,

static void hstcp_cong_avoid(struct sock *sk, u32 adk,

			     u32 in_flight, int data_acked)

{

	struct tcp_sock *tp = tcp_sk(sk);