---

yaml --- r: 179108 b: refs/heads/master c: 704da56 h: refs/heads/master v: v3
git-mirror · Jan 8, 2010 · 254fe8b · 254fe8b
1 parent 84e274a
commit 254fe8b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ca518b64b4b5865b677f292322e893fa89997d4
+refs/heads/master: 704da560c0a0120d8869187f511491a00951a1d3
diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c
@@ -1205,6 +1205,10 @@ struct sock *sk_clone(const struct sock *sk, const gfp_t priority)
 
 		if (newsk->sk_prot->sockets_allocated)
 			percpu_counter_inc(newsk->sk_prot->sockets_allocated);
+
+		if (sock_flag(newsk, SOCK_TIMESTAMP) ||
+		    sock_flag(newsk, SOCK_TIMESTAMPING_RX_SOFTWARE))
+			net_enable_timestamp();
 	}
 out:
 	return newsk;