From 51e085cac758a7760e669dab8a04ff45d599a55d Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Sun, 19 Aug 2007 17:18:55 -0700 Subject: [PATCH] --- yaml --- r: 66296 b: refs/heads/master c: 234748954a9880cce8a065698dcbf692f9c23918 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/dccp/options.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index af22ec79bbc4..abdcaa0cf745 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 19ac21465e15e476220909c01b23df847b6ffa30 +refs/heads/master: 234748954a9880cce8a065698dcbf692f9c23918 diff --git a/trunk/net/dccp/options.c b/trunk/net/dccp/options.c index 95b75d8354ff..439e25daa963 100644 --- a/trunk/net/dccp/options.c +++ b/trunk/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 */