diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2012-04-12 15:48:40 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-14 15:24:26 -0400 |
commit | fd4f2cead6983735a4e6283126b9276873d7ff09 (patch) | |
tree | 2b5313230f3abe2b678230d4182cc6d2f2870062 /net | |
parent | eff98db027c50f1e4ad14f1d9069d55e5f7e4319 (diff) |
tcp: RFC6298 supersedes RFC2988bis
Updates some comments to track RFC6298
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: H.K. Jerry Chu <hkchu@google.com>
Cc: Tom Herbert <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/inet_connection_sock.c | 2 | ||||
-rw-r--r-- | net/ipv4/tcp_input.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index 19d66cefd7d3..c12396f2785f 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c | |||
@@ -514,7 +514,7 @@ void inet_csk_reqsk_queue_prune(struct sock *parent, | |||
514 | 514 | ||
515 | /* Normally all the openreqs are young and become mature | 515 | /* Normally all the openreqs are young and become mature |
516 | * (i.e. converted to established socket) for first timeout. | 516 | * (i.e. converted to established socket) for first timeout. |
517 | * If synack was not acknowledged for 3 seconds, it means | 517 | * If synack was not acknowledged for 1 second, it means |
518 | * one of the following things: synack was lost, ack was lost, | 518 | * one of the following things: synack was lost, ack was lost, |
519 | * rtt is high or nobody planned to ack (i.e. synflood). | 519 | * rtt is high or nobody planned to ack (i.e. synflood). |
520 | * When server is a bit loaded, queue is populated with old | 520 | * When server is a bit loaded, queue is populated with old |
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 9944c1d9a218..dc1e0be30b77 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
@@ -936,7 +936,7 @@ static void tcp_init_metrics(struct sock *sk) | |||
936 | tcp_set_rto(sk); | 936 | tcp_set_rto(sk); |
937 | reset: | 937 | reset: |
938 | if (tp->srtt == 0) { | 938 | if (tp->srtt == 0) { |
939 | /* RFC2988bis: We've failed to get a valid RTT sample from | 939 | /* RFC6298: 5.7 We've failed to get a valid RTT sample from |
940 | * 3WHS. This is most likely due to retransmission, | 940 | * 3WHS. This is most likely due to retransmission, |
941 | * including spurious one. Reset the RTO back to 3secs | 941 | * including spurious one. Reset the RTO back to 3secs |
942 | * from the more aggressive 1sec to avoid more spurious | 942 | * from the more aggressive 1sec to avoid more spurious |
@@ -946,7 +946,7 @@ reset: | |||
946 | inet_csk(sk)->icsk_rto = TCP_TIMEOUT_FALLBACK; | 946 | inet_csk(sk)->icsk_rto = TCP_TIMEOUT_FALLBACK; |
947 | } | 947 | } |
948 | /* Cut cwnd down to 1 per RFC5681 if SYN or SYN-ACK has been | 948 | /* Cut cwnd down to 1 per RFC5681 if SYN or SYN-ACK has been |
949 | * retransmitted. In light of RFC2988bis' more aggressive 1sec | 949 | * retransmitted. In light of RFC6298 more aggressive 1sec |
950 | * initRTO, we only reset cwnd when more than 1 SYN/SYN-ACK | 950 | * initRTO, we only reset cwnd when more than 1 SYN/SYN-ACK |
951 | * retransmission has occurred. | 951 | * retransmission has occurred. |
952 | */ | 952 | */ |