Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[linux-2.6] / net / ipv4 / tcp_vegas.c

diff --git a/net/ipv4/tcp_vegas.c b/net/ipv4/tcp_vegas.c
index 73e19cf7df2176e6189c45569939bf42e51f0363..e218a51ceced186b9c37acab906009dfbfe94233 100644 (file)
--- a/net/ipv4/tcp_vegas.c
+++ b/net/ipv4/tcp_vegas.c
@@ -117,6 +117,9 @@ void tcp_vegas_pkts_acked(struct sock *sk, u32 cnt, ktime_t last)
        struct vegas *vegas = inet_csk_ca(sk);
        u32 vrtt;
 
+       if (ktime_equal(last, net_invalid_timestamp()))
+               return;
+
        /* Never allow zero rtt or baseRTT */
        vrtt = ktime_to_us(net_timedelta(last)) + 1;