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

Commit a7fa3770 authored by Jon Maxwell's avatar Jon Maxwell Committed by David S. Miller
Browse files

tcp: Add tcp_retransmit_stamp() helper routine 



Create a seperate helper routine as per Neal Cardwells suggestion. To
be used by the final commit in this series and retransmits_timed_out().

Signed-off-by: default avatarJon Maxwell <jmaxwell37@gmail.com>
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9bcc66e1

net/ipv4/tcp_timer.c

+17 −8
Original line number Diff line number Diff line
@@ -22,6 +22,20 @@ 
#include <linux/gfp.h>

#include <net/tcp.h>



u32 tcp_retransmit_stamp(const struct sock *sk)

{

	u32 start_ts = tcp_sk(sk)->retrans_stamp;



	if (unlikely(!start_ts)) {

		struct sk_buff *head = tcp_rtx_queue_head(sk);



		if (!head)

			return 0;

		start_ts = tcp_skb_timestamp(head);

	}

	return start_ts;

}



/**

 *  tcp_write_err() - close socket and save error info

 *  @sk:  The socket the error has appeared on.
@@ -166,14 +180,9 @@ static bool retransmits_timed_out(struct sock *sk, 
	if (!inet_csk(sk)->icsk_retransmits)

		return false;



	start_ts = tcp_sk(sk)->retrans_stamp;

	if (unlikely(!start_ts)) {

		struct sk_buff *head = tcp_rtx_queue_head(sk);



		if (!head)

	start_ts = tcp_retransmit_stamp(sk);

	if (!start_ts)

		return false;

		start_ts = tcp_skb_timestamp(head);

	}



	if (likely(timeout == 0)) {

		linear_backoff_thresh = ilog2(TCP_RTO_MAX/rto_base);