---

yaml --- r: 214922 b: refs/heads/master c: 3f66116 h: refs/heads/master v: v3
git-mirror · Oct 5, 2010 · 2b45ccc · 2b45ccc
1 parent d6d7e60
commit 2b45ccc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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));