Commit 86fd14ad authored by Weiping Pan's avatar Weiping Pan Committed by David S. Miller
Browse files

tcp: make tcp_cwnd_application_limited() static 



Make tcp_cwnd_application_limited() static and move it from tcp_input.c to
tcp_output.c

Signed-off-by: default avatarWeiping Pan <wpan@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 17d8ecb8

include/net/tcp.h

+0 −1
Original line number Diff line number Diff line
@@ -558,7 +558,6 @@ void tcp_send_loss_probe(struct sock *sk); 
bool tcp_schedule_loss_probe(struct sock *sk);



/* tcp_input.c */

void tcp_cwnd_application_limited(struct sock *sk);

void tcp_resume_early_retransmit(struct sock *sk);

void tcp_rearm_rto(struct sock *sk);

void tcp_reset(struct sock *sk);

net/ipv4/tcp_input.c

+0 −22
Original line number Diff line number Diff line
@@ -4703,28 +4703,6 @@ static int tcp_prune_queue(struct sock *sk) 
	return -1;

}



/* RFC2861, slow part. Adjust cwnd, after it was not full during one rto.

 * As additional protections, we do not touch cwnd in retransmission phases,

 * and if application hit its sndbuf limit recently.

 */

void tcp_cwnd_application_limited(struct sock *sk)

{

	struct tcp_sock *tp = tcp_sk(sk);



	if (inet_csk(sk)->icsk_ca_state == TCP_CA_Open &&

	    sk->sk_socket && !test_bit(SOCK_NOSPACE, &sk->sk_socket->flags)) {

		/* Limited by application or receiver window. */

		u32 init_win = tcp_init_cwnd(tp, __sk_dst_get(sk));

		u32 win_used = max(tp->snd_cwnd_used, init_win);

		if (win_used < tp->snd_cwnd) {

			tp->snd_ssthresh = tcp_current_ssthresh(sk);

			tp->snd_cwnd = (tp->snd_cwnd + win_used) >> 1;

		}

		tp->snd_cwnd_used = 0;

	}

	tp->snd_cwnd_stamp = tcp_time_stamp;

}



static bool tcp_should_expand_sndbuf(const struct sock *sk)

{

	const struct tcp_sock *tp = tcp_sk(sk);

net/ipv4/tcp_output.c

+22 −0
Original line number Diff line number Diff line
@@ -1387,6 +1387,28 @@ unsigned int tcp_current_mss(struct sock *sk) 
	return mss_now;

}



/* RFC2861, slow part. Adjust cwnd, after it was not full during one rto.

 * As additional protections, we do not touch cwnd in retransmission phases,

 * and if application hit its sndbuf limit recently.

 */

static void tcp_cwnd_application_limited(struct sock *sk)

{

	struct tcp_sock *tp = tcp_sk(sk);



	if (inet_csk(sk)->icsk_ca_state == TCP_CA_Open &&

	    sk->sk_socket && !test_bit(SOCK_NOSPACE, &sk->sk_socket->flags)) {

		/* Limited by application or receiver window. */

		u32 init_win = tcp_init_cwnd(tp, __sk_dst_get(sk));

		u32 win_used = max(tp->snd_cwnd_used, init_win);

		if (win_used < tp->snd_cwnd) {

			tp->snd_ssthresh = tcp_current_ssthresh(sk);

			tp->snd_cwnd = (tp->snd_cwnd + win_used) >> 1;

		}

		tp->snd_cwnd_used = 0;

	}

	tp->snd_cwnd_stamp = tcp_time_stamp;

}



/* Congestion window validation. (RFC2861) */

static void tcp_cwnd_validate(struct sock *sk)

{