Merge branch 'linux-2.6'

[powerpc.git] / net / ipv4 / tcp_vegas.c

diff --git a/net/ipv4/tcp_vegas.c b/net/ipv4/tcp_vegas.c
index 0f0ee7f..73e19cf 100644 (file)
--- a/net/ipv4/tcp_vegas.c
+++ b/net/ipv4/tcp_vegas.c
@@ -118,7 +118,7 @@ void tcp_vegas_pkts_acked(struct sock *sk, u32 cnt, ktime_t last)
        u32 vrtt;
 
        /* Never allow zero rtt or baseRTT */
-       vrtt = (ktime_to_ns(net_timedelta(last)) / NSEC_PER_USEC) + 1;
+       vrtt = ktime_to_us(net_timedelta(last)) + 1;
 
        /* Filter to find propagation delay: */
        if (vrtt < vegas->baseRTT)