summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAlban Crequy <alban.crequy@collabora.co.uk>2010-10-04 08:48:28 +0000
committerDavid S. Miller <davem@davemloft.net>2010-10-05 14:54:36 -0700
commit3f66116e89521ef71ab0d63dc07a639def88a577 (patch)
tree865ff7eed2724cc0ae141341fe17c612aa414c89 /net
parentd6bf781712a1d25cc8987036b3a48535b331eb91 (diff)
downloadop-kernel-dev-3f66116e89521ef71ab0d63dc07a639def88a577.zip
op-kernel-dev-3f66116e89521ef71ab0d63dc07a639def88a577.tar.gz
AF_UNIX: Implement SO_TIMESTAMP and SO_TIMETAMPNS on Unix sockets
Userspace applications can already request to receive timestamps with: setsockopt(sockfd, SOL_SOCKET, SO_TIMESTAMP, ...) Although setsockopt() returns zero (success), timestamps are not added to the ancillary data. This patch fixes that on SOCK_DGRAM and SOCK_SEQPACKET Unix sockets. Signed-off-by: Alban Crequy <alban.crequy@collabora.co.uk> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/unix/af_unix.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index c586da3..0ebc777 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1511,6 +1511,8 @@ restart:
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));
OpenPOWER on IntegriCloud