diff options
-rw-r--r-- | include/net/tcp.h | 2 | ||||
-rw-r--r-- | net/ipv4/inet_connection_sock.c | 2 | ||||
-rw-r--r-- | net/ipv4/tcp_input.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index f75a04d752cb..057f0168462e 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h | |||
@@ -123,7 +123,7 @@ extern void tcp_time_wait(struct sock *sk, int state, int timeo); | |||
123 | #endif | 123 | #endif |
124 | #define TCP_RTO_MAX ((unsigned)(120*HZ)) | 124 | #define TCP_RTO_MAX ((unsigned)(120*HZ)) |
125 | #define TCP_RTO_MIN ((unsigned)(HZ/5)) | 125 | #define TCP_RTO_MIN ((unsigned)(HZ/5)) |
126 | #define TCP_TIMEOUT_INIT ((unsigned)(1*HZ)) /* RFC2988bis initial RTO value */ | 126 | #define TCP_TIMEOUT_INIT ((unsigned)(1*HZ)) /* RFC6298 2.1 initial RTO value */ |
127 | #define TCP_TIMEOUT_FALLBACK ((unsigned)(3*HZ)) /* RFC 1122 initial RTO value, now | 127 | #define TCP_TIMEOUT_FALLBACK ((unsigned)(3*HZ)) /* RFC 1122 initial RTO value, now |
128 | * used as a fallback RTO for the | 128 | * used as a fallback RTO for the |
129 | * initial data transmission if no | 129 | * initial data transmission if no |
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 | */ |