Merge tag 'rtc-v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni...

[firefly-linux-kernel-4.4.55.git] / net / ipv4 / tcp_cdg.c

diff --git a/net/ipv4/tcp_cdg.c b/net/ipv4/tcp_cdg.c
index a52ce2db53f2d3c8f1d032628226b4c257c31dc2..8c6fd3d5e40feeb3c0b422d0e697e1a674b4f576 100644 (file)
--- a/net/ipv4/tcp_cdg.c
+++ b/net/ipv4/tcp_cdg.c
@@ -145,7 +145,7 @@ static void tcp_cdg_hystart_update(struct sock *sk)
                return;
 
        if (hystart_detect & HYSTART_ACK_TRAIN) {
-               u32 now_us = local_clock() / NSEC_PER_USEC;
+               u32 now_us = div_u64(local_clock(), NSEC_PER_USEC);
 
                if (ca->last_ack == 0 || !tcp_is_cwnd_limited(sk)) {
                        ca->last_ack = now_us;