diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-15 18:15:17 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-15 18:15:17 -0400 |
| commit | c337ffb68e1e71bad069b14d2246fa1e0c31699c (patch) | |
| tree | 7861a59b196adfd63758cc0921e4fb56030fbaf3 /net/ipv4/tcp_input.c | |
| parent | 30df754dedebf27ef90452944a723ba058d23396 (diff) | |
| parent | 84c0c6933cb0303fa006992a6659c2b46de4eb17 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 08ea735b9d72..da782e7ab16d 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, | |||
| 3350 | net_invalid_timestamp())) | 3350 | net_invalid_timestamp())) |
| 3351 | rtt_us = ktime_us_delta(ktime_get_real(), | 3351 | rtt_us = ktime_us_delta(ktime_get_real(), |
| 3352 | last_ackt); | 3352 | last_ackt); |
| 3353 | else if (ca_seq_rtt > 0) | 3353 | else if (ca_seq_rtt >= 0) |
| 3354 | rtt_us = jiffies_to_usecs(ca_seq_rtt); | 3354 | rtt_us = jiffies_to_usecs(ca_seq_rtt); |
| 3355 | } | 3355 | } |
| 3356 | 3356 | ||