From 2b45ccc8c45c1c90c30a6d750d176736c3a2061e Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban.crequy@collabora.co.uk>
Date: Mon, 4 Oct 2010 08:48:28 +0000
Subject: [PATCH] --- yaml --- r: 214922 b: refs/heads/master c:
 3f66116e89521ef71ab0d63dc07a639def88a577 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/net/unix/af_unix.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b88db5cbdf9c..3ecdc1b9f646 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6bf781712a1d25cc8987036b3a48535b331eb91
+refs/heads/master: 3f66116e89521ef71ab0d63dc07a639def88a577
diff --git a/trunk/net/unix/af_unix.c b/trunk/net/unix/af_unix.c
index c586da3f4f18..0ebc777a6660 100644
--- a/trunk/net/unix/af_unix.c
+++ b/trunk/net/unix/af_unix.c
@@ -1511,6 +1511,8 @@ static int unix_dgram_sendmsg(struct kiocb *kiocb, struct socket *sock,
 		goto restart;
 	}
 
+	if (sock_flag(other, SOCK_RCVTSTAMP))
+		__net_timestamp(skb);
 	skb_queue_tail(&other->sk_receive_queue, skb);
 	unix_state_unlock(other);
 	other->sk_data_ready(other, len);
@@ -1722,6 +1724,9 @@ static int unix_dgram_recvmsg(struct kiocb *iocb, struct socket *sock,
 	if (err)
 		goto out_free;
 
+	if (sock_flag(sk, SOCK_RCVTSTAMP))
+		__sock_recv_timestamp(msg, sk, skb);
+
 	if (!siocb->scm) {
 		siocb->scm = &tmp_scm;
 		memset(&tmp_scm, 0, sizeof(tmp_scm));