[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>

diff --git a/include/linux/ktime.h b/include/linux/ktime.h
index 248305bb9a181681e837667a9fa0f005330a3fa0..81bb9c7a4eb3fec22b97ea1c2c1cd17e5baffd23 100644 (file)
--- a/include/linux/ktime.h
+++ b/include/linux/ktime.h
@@ -259,6 +259,12 @@ static inline s64 ktime_to_ns(const ktime_t kt)
 
 #endif
 
+static inline s64 ktime_to_us(const ktime_t kt)
+{
+       struct timeval tv = ktime_to_timeval(kt);
+       return (s64) tv.tv_sec * USEC_PER_SEC + tv.tv_usec;
+}
+
 /*
  * The resolution of the clocks. The resolution value is returned in
  * the clock_getres() system call to give application programmers an

diff --git a/net/ipv4/tcp_illinois.c b/net/ipv4/tcp_illinois.c
index 8e3165917f724fceae18ba0d217b6198900d0362..4adc47c55351a49d09d172b1cb5a3baa194207bc 100644 (file)
--- 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 b4e062ab24a102e018a05cf046c59c45b7b6762f..43294ad9f63ef839cd26f693ccf1a4eb8b4173ee 100644 (file)
--- 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 0f0ee7f732c3a0bba593f00ea37d38df65f28e18..73e19cf7df2176e6189c45569939bf42e51f0363 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)

diff --git a/net/ipv4/tcp_veno.c b/net/ipv4/tcp_veno.c
index 0b50d0607a0e7fd7da470fb8eec5ebc4266586ca..9edb340f2f95c6e003f5ff09f135425423881134 100644 (file)
--- 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)