diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
| commit | a56e74f546b64be93731e42d83baf5b538cc1b11 (patch) | |
| tree | 18f6dee45d801e57ac9db2a31664b0d5c0762c50 /net/ipv4/tcp_metrics.c | |
| parent | d08e2e09042bd3f7ef66a35cb4bb92794ab26bb2 (diff) | |
| parent | e4e7f10bfc4069925e99cc4b428c3434e30b6c3f (diff) | |
Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into devel-stable
Diffstat (limited to 'net/ipv4/tcp_metrics.c')
| -rw-r--r-- | net/ipv4/tcp_metrics.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/tcp_metrics.c b/net/ipv4/tcp_metrics.c index 4a22f3e715df..52f3c6b971d2 100644 --- a/net/ipv4/tcp_metrics.c +++ b/net/ipv4/tcp_metrics.c | |||
| @@ -502,7 +502,9 @@ reset: | |||
| 502 | * ACKs, wait for troubles. | 502 | * ACKs, wait for troubles. |
| 503 | */ | 503 | */ |
| 504 | if (crtt > tp->srtt) { | 504 | if (crtt > tp->srtt) { |
| 505 | inet_csk(sk)->icsk_rto = crtt + max(crtt >> 2, tcp_rto_min(sk)); | 505 | /* Set RTO like tcp_rtt_estimator(), but from cached RTT. */ |
| 506 | crtt >>= 3; | ||
| 507 | inet_csk(sk)->icsk_rto = crtt + max(2 * crtt, tcp_rto_min(sk)); | ||
| 506 | } else if (tp->srtt == 0) { | 508 | } else if (tp->srtt == 0) { |
| 507 | /* RFC6298: 5.7 We've failed to get a valid RTT sample from | 509 | /* RFC6298: 5.7 We've failed to get a valid RTT sample from |
| 508 | * 3WHS. This is most likely due to retransmission, | 510 | * 3WHS. This is most likely due to retransmission, |