Commit fd4f2cea authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

tcp: RFC6298 supersedes RFC2988bis 



Updates some comments to track RFC6298

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: H.K. Jerry Chu <hkchu@google.com>
Cc: Tom Herbert <therbert@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent eff98db0

include/net/tcp.h

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ extern void tcp_time_wait(struct sock *sk, int state, int timeo); 
#endif

#define TCP_RTO_MAX	((unsigned)(120*HZ))

#define TCP_RTO_MIN	((unsigned)(HZ/5))

#define TCP_TIMEOUT_INIT ((unsigned)(1*HZ))	/* RFC2988bis initial RTO value	*/

#define TCP_TIMEOUT_INIT ((unsigned)(1*HZ))	/* RFC6298 2.1 initial RTO value	*/

#define TCP_TIMEOUT_FALLBACK ((unsigned)(3*HZ))	/* RFC 1122 initial RTO value, now

						 * used as a fallback RTO for the

						 * initial data transmission if no

net/ipv4/inet_connection_sock.c

+1 −1
Original line number Diff line number Diff line
@@ -514,7 +514,7 @@ void inet_csk_reqsk_queue_prune(struct sock *parent, 


	/* Normally all the openreqs are young and become mature

	 * (i.e. converted to established socket) for first timeout.

	 * If synack was not acknowledged for 3 seconds, it means

	 * If synack was not acknowledged for 1 second, it means

	 * one of the following things: synack was lost, ack was lost,

	 * rtt is high or nobody planned to ack (i.e. synflood).

	 * When server is a bit loaded, queue is populated with old

net/ipv4/tcp_input.c

+2 −2
Original line number Diff line number Diff line
@@ -936,7 +936,7 @@ static void tcp_init_metrics(struct sock *sk) 
	tcp_set_rto(sk);

reset:

	if (tp->srtt == 0) {

		/* RFC2988bis: We've failed to get a valid RTT sample from

		/* RFC6298: 5.7 We've failed to get a valid RTT sample from

		 * 3WHS. This is most likely due to retransmission,

		 * including spurious one. Reset the RTO back to 3secs

		 * from the more aggressive 1sec to avoid more spurious
@@ -946,7 +946,7 @@ static void tcp_init_metrics(struct sock *sk) 
		inet_csk(sk)->icsk_rto = TCP_TIMEOUT_FALLBACK;

	}

	/* Cut cwnd down to 1 per RFC5681 if SYN or SYN-ACK has been

	 * retransmitted. In light of RFC2988bis' more aggressive 1sec

	 * retransmitted. In light of RFC6298 more aggressive 1sec

	 * initRTO, we only reset cwnd when more than 1 SYN/SYN-ACK

	 * retransmission has occurred.

	 */