Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-2.6-omap-h63xx.git] / net / ipv4 / tcp_veno.c

diff --git a/net/ipv4/tcp_veno.c b/net/ipv4/tcp_veno.c
index 9edb340f2f95c6e003f5ff09f135425423881134..ec854cc5fad50fd90899818086310cd51b61cbdc 100644 (file)
--- a/net/ipv4/tcp_veno.c
+++ b/net/ipv4/tcp_veno.c
@@ -74,6 +74,9 @@ static void tcp_veno_pkts_acked(struct sock *sk, u32 cnt, ktime_t last)
        struct veno *veno = 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;