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

Commit 4c712441 authored by Yuchung Cheng's avatar Yuchung Cheng Committed by David S. Miller
Browse files

tcp: remove two unused functions 



remove tcp_may_send_now and tcp_snd_test that are no longer used

Fixes: 840a3cbe ("tcp: remove forward retransmit feature")
Signed-off-by: default avatarYuchung Cheng <ycheng@google.com>
Signed-off-by: default avatarNeal Cardwell <ncardwell@google.com>
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 582db7e0

include/net/tcp.h

+0 −1
Original line number Diff line number Diff line
@@ -544,7 +544,6 @@ u32 tcp_tso_autosize(const struct sock *sk, unsigned int mss_now, 
		     int min_tso_segs);

void __tcp_push_pending_frames(struct sock *sk, unsigned int cur_mss,

			       int nonagle);

bool tcp_may_send_now(struct sock *sk);

int __tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb, int segs);

int tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb, int segs);

void tcp_retransmit_timer(struct sock *sk);

net/ipv4/tcp_output.c

+0 −34
Original line number Diff line number Diff line
@@ -1806,40 +1806,6 @@ static bool tcp_snd_wnd_test(const struct tcp_sock *tp, 
	return !after(end_seq, tcp_wnd_end(tp));

}



/* This checks if the data bearing packet SKB (usually tcp_send_head(sk))

 * should be put on the wire right now.  If so, it returns the number of

 * packets allowed by the congestion window.

 */

static unsigned int tcp_snd_test(const struct sock *sk, struct sk_buff *skb,

				 unsigned int cur_mss, int nonagle)

{

	const struct tcp_sock *tp = tcp_sk(sk);

	unsigned int cwnd_quota;



	tcp_init_tso_segs(skb, cur_mss);



	if (!tcp_nagle_test(tp, skb, cur_mss, nonagle))

		return 0;



	cwnd_quota = tcp_cwnd_test(tp, skb);

	if (cwnd_quota && !tcp_snd_wnd_test(tp, skb, cur_mss))

		cwnd_quota = 0;



	return cwnd_quota;

}



/* Test if sending is allowed right now. */

bool tcp_may_send_now(struct sock *sk)

{

	const struct tcp_sock *tp = tcp_sk(sk);

	struct sk_buff *skb = tcp_send_head(sk);



	return skb &&

		tcp_snd_test(sk, skb, tcp_current_mss(sk),

			     (tcp_skb_is_last(sk, skb) ?

			      tp->nonagle : TCP_NAGLE_PUSH));

}



/* Trim TSO SKB to LEN bytes, put the remaining data into a new packet

 * which is put after SKB on the list.  It is very much like

 * tcp_fragment() except that it may make several kinds of assumptions