---

yaml --- r: 66296 b: refs/heads/master c: 2347489 h: refs/heads/master v: v3
git-mirror · Oct 10, 2007 · 51e085c · 51e085c
1 parent a2c15b1
commit 51e085c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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 */