summaryrefslogtreecommitdiff
path: root/net/ipv4
diff options
context:
space:
mode:
authorstephen hemminger <shemminger@vyatta.com>2011-03-14 07:52:12 +0000
committerDavid S. Miller <davem@davemloft.net>2011-03-14 15:54:38 -0700
commitfebf081987ec445f071ed10b73e9707a88cc5cc4 (patch)
tree2afd0d3fba79620b889935b678ac8c024e10c19d /net/ipv4
parenta23c37f1110d8912d4d0a66e78197e9195bb36d4 (diff)
downloadlinux-3.10-febf081987ec445f071ed10b73e9707a88cc5cc4.tar.gz
linux-3.10-febf081987ec445f071ed10b73e9707a88cc5cc4.tar.bz2
linux-3.10-febf081987ec445f071ed10b73e9707a88cc5cc4.zip
tcp: fix RTT for quick packets in congestion control
In the congestion control interface, the callback for each ACK includes an estimated round trip time in microseconds. Some algorithms need high resolution (Vegas style) but most only need jiffie resolution. If RTT is not accurate (like a retransmission) -1 is used as a flag value. When doing coarse resolution if RTT is less than a a jiffie then 0 should be returned rather than no estimate. Otherwise algorithms that expect good ack's to trigger slow start (like CUBIC Hystart) will be confused. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/tcp_input.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 65f6c040624..e16b17efcf5 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -3350,7 +3350,7 @@ static int tcp_clean_rtx_queue(struct sock *sk, int prior_fackets,
net_invalid_timestamp()))
rtt_us = ktime_us_delta(ktime_get_real(),
last_ackt);
- else if (ca_seq_rtt > 0)
+ else if (ca_seq_rtt >= 0)
rtt_us = jiffies_to_usecs(ca_seq_rtt);
}