From: Arnaldo Carvalho de Melo Date: Mon, 20 Aug 2007 00:18:55 +0000 (-0700) Subject: [DCCP] options: convert dccp_insert_option_timestamp to ktime_t X-Git-Tag: v2.6.24-rc1~1454^2~787 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=234748954a9880cce8a065698dcbf692f9c23918;p=~emulex%2Finfiniband.git [DCCP] options: convert dccp_insert_option_timestamp to ktime_t Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller --- diff --git a/net/dccp/options.c b/net/dccp/options.c index 95b75d8354f..439e25daa96 100644 --- a/net/dccp/options.c +++ b/net/dccp/options.c @@ -388,11 +388,7 @@ EXPORT_SYMBOL_GPL(dccp_timestamp); int dccp_insert_option_timestamp(struct sock *sk, struct sk_buff *skb) { - struct timeval tv; - __be32 now; - - dccp_timestamp(sk, &tv); - now = htonl(timeval_usecs(&tv) / 10); + __be32 now = htonl(((suseconds_t)ktime_to_us(ktime_get_real())) / 10); /* yes this will overflow but that is the point as we want a * 10 usec 32 bit timer which mean it wraps every 11.9 hours */