diff options
author | Alban Crequy <alban.crequy@collabora.co.uk> | 2010-10-04 04:48:28 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-10-05 17:54:36 -0400 |
commit | 3f66116e89521ef71ab0d63dc07a639def88a577 (patch) | |
tree | 865ff7eed2724cc0ae141341fe17c612aa414c89 /net/unix/af_unix.c | |
parent | d6bf781712a1d25cc8987036b3a48535b331eb91 (diff) |
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/unix/af_unix.c')
-rw-r--r-- | net/unix/af_unix.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index c586da3f4f18..0ebc777a6660 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
@@ -1511,6 +1511,8 @@ restart: | |||
1511 | goto restart; | 1511 | goto restart; |
1512 | } | 1512 | } |
1513 | 1513 | ||
1514 | if (sock_flag(other, SOCK_RCVTSTAMP)) | ||
1515 | __net_timestamp(skb); | ||
1514 | skb_queue_tail(&other->sk_receive_queue, skb); | 1516 | skb_queue_tail(&other->sk_receive_queue, skb); |
1515 | unix_state_unlock(other); | 1517 | unix_state_unlock(other); |
1516 | other->sk_data_ready(other, len); | 1518 | other->sk_data_ready(other, len); |
@@ -1722,6 +1724,9 @@ static int unix_dgram_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
1722 | if (err) | 1724 | if (err) |
1723 | goto out_free; | 1725 | goto out_free; |
1724 | 1726 | ||
1727 | if (sock_flag(sk, SOCK_RCVTSTAMP)) | ||
1728 | __sock_recv_timestamp(msg, sk, skb); | ||
1729 | |||
1725 | if (!siocb->scm) { | 1730 | if (!siocb->scm) { |
1726 | siocb->scm = &tmp_scm; | 1731 | siocb->scm = &tmp_scm; |
1727 | memset(&tmp_scm, 0, sizeof(tmp_scm)); | 1732 | memset(&tmp_scm, 0, sizeof(tmp_scm)); |