[TCP]: Fix linkage errors on i386.

To avoid raw division, use ktime_to_timeval() to get usec.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

4 files changed, 4 insertions, 4 deletions

diff --git a/net/ipv4/tcp_illinois.c b/net/ipv4/tcp_illinois.c
index 8e3165917f72..4adc47c55351 100644
--- a/net/ipv4/tcp_illinois.c
+++ b/net/ipv4/tcp_illinois.c
@@ -90,7 +90,7 @@ static void tcp_illinois_acked(struct sock *sk, u32 pkts_acked, ktime_t last)
 
         ca->acked = pkts_acked;
 
-        rtt = ktime_to_ns(net_timedelta(last)) / NSEC_PER_USEC;
+        rtt = ktime_to_us(net_timedelta(last));
 
         /* ignore bogus values, this prevents wraparound in alpha math */
         if (rtt > RTT_MAX)
diff --git a/net/ipv4/tcp_lp.c b/net/ipv4/tcp_lp.c
index b4e062ab24a1..43294ad9f63e 100644
--- a/net/ipv4/tcp_lp.c
+++ b/net/ipv4/tcp_lp.c
@@ -266,7 +266,7 @@ static void tcp_lp_pkts_acked(struct sock *sk, u32 num_acked, ktime_t last)
         struct tcp_sock *tp = tcp_sk(sk);
         struct lp *lp = inet_csk_ca(sk);
 
-        tcp_lp_rtt_sample(sk,  ktime_to_ns(net_timedelta(last)) / NSEC_PER_USEC);
+        tcp_lp_rtt_sample(sk,  ktime_to_us(net_timedelta(last)));
 
         /* calc inference */
         if (tcp_time_stamp > tp->rx_opt.rcv_tsecr)
diff --git a/net/ipv4/tcp_vegas.c b/net/ipv4/tcp_vegas.c
index 0f0ee7f732c3..73e19cf7df21 100644
--- 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)
diff --git a/net/ipv4/tcp_veno.c b/net/ipv4/tcp_veno.c
index 0b50d0607a0e..9edb340f2f95 100644
--- a/net/ipv4/tcp_veno.c
+++ b/net/ipv4/tcp_veno.c
@@ -75,7 +75,7 @@ static void tcp_veno_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 < veno->basertt)