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

Commit 45f74359 authored by Stanislav Fomichev's avatar Stanislav Fomichev Committed by David S. Miller
Browse files

tcp: remove unused min_cwnd member of tcp_congestion_ops 



Commit 684bad11 "tcp: use PRR to reduce cwin in CWR state" removed all
calls to min_cwnd, so we can safely remove it.
Also, remove tcp_reno_min_cwnd because it was only used for min_cwnd.

Signed-off-by: default avatarStanislav Fomichev <stfomichev@yandex-team.ru>
Acked-by: default avatarYuchung Cheng <ycheng@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f93f160b

Documentation/networking/tcp.txt

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ A congestion control mechanism can be registered through functions in 
tcp_cong.c. The functions used by the congestion control mechanism are

registered via passing a tcp_congestion_ops struct to

tcp_register_congestion_control. As a minimum name, ssthresh,

cong_avoid, min_cwnd must be valid.

cong_avoid must be valid.



Private data for a congestion control mechanism is stored in tp->ca_priv.

tcp_ca(tp) returns a pointer to this space.  This is preallocated space - it

include/net/tcp.h

+0 −3
Original line number Diff line number Diff line
@@ -791,8 +791,6 @@ struct tcp_congestion_ops { 


	/* return slow start threshold (required) */

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

	/* 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 acked, u32 in_flight);

	/* call before changing ca_state (optional) */
@@ -827,7 +825,6 @@ 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);

u32 tcp_reno_min_cwnd(const struct sock *sk);

extern struct tcp_congestion_ops tcp_reno;



static inline void tcp_set_ca_state(struct sock *sk, const u8 ca_state)

net/ipv4/tcp_cong.c

+0 −10
Original line number Diff line number Diff line
@@ -362,21 +362,12 @@ u32 tcp_reno_ssthresh(struct sock *sk) 
}

EXPORT_SYMBOL_GPL(tcp_reno_ssthresh);



/* Lower bound on congestion window with halving. */

u32 tcp_reno_min_cwnd(const struct sock *sk)

{

	const struct tcp_sock *tp = tcp_sk(sk);

	return tp->snd_ssthresh/2;

}

EXPORT_SYMBOL_GPL(tcp_reno_min_cwnd);



struct tcp_congestion_ops tcp_reno = {

	.flags		= TCP_CONG_NON_RESTRICTED,

	.name		= "reno",

	.owner		= THIS_MODULE,

	.ssthresh	= tcp_reno_ssthresh,

	.cong_avoid	= tcp_reno_cong_avoid,

	.min_cwnd	= tcp_reno_min_cwnd,

};



/* Initial congestion control used (until SYN)
@@ -388,6 +379,5 @@ struct tcp_congestion_ops tcp_init_congestion_ops = { 
	.owner		= THIS_MODULE,

	.ssthresh	= tcp_reno_ssthresh,

	.cong_avoid	= tcp_reno_cong_avoid,

	.min_cwnd	= tcp_reno_min_cwnd,

};

EXPORT_SYMBOL_GPL(tcp_init_congestion_ops);

net/ipv4/tcp_highspeed.c

+0 −1
Original line number Diff line number Diff line
@@ -162,7 +162,6 @@ static struct tcp_congestion_ops tcp_highspeed __read_mostly = { 
	.init		= hstcp_init,

	.ssthresh	= hstcp_ssthresh,

	.cong_avoid	= hstcp_cong_avoid,

	.min_cwnd	= tcp_reno_min_cwnd,



	.owner		= THIS_MODULE,

	.name		= "highspeed"

net/ipv4/tcp_hybla.c

+0 −1
Original line number Diff line number Diff line
@@ -166,7 +166,6 @@ static void hybla_cong_avoid(struct sock *sk, u32 ack, u32 acked, 
static struct tcp_congestion_ops tcp_hybla __read_mostly = {

	.init		= hybla_init,

	.ssthresh	= tcp_reno_ssthresh,

	.min_cwnd	= tcp_reno_min_cwnd,

	.cong_avoid	= hybla_cong_avoid,

	.set_state	= hybla_state,