aboutsummaryrefslogtreecommitdiffstats
path: root/net/compat.c
diff options
context:
space:
mode:
authorEric Dumazet <dada1@cosmosbay.com>2007-03-26 01:14:49 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 01:24:21 -0400
commit92f37fd2ee805aa77925c1e64fd56088b46094fc (patch)
tree8251c38b83ab362116dac89d94412ce229b42831 /net/compat.c
parentc7a3c5da35055e2fa97ed4f0da3eec4bd0ef4c38 (diff)
[NET]: Adding SO_TIMESTAMPNS / SCM_TIMESTAMPNS support
Now that network timestamps use ktime_t infrastructure, we can add a new SOL_SOCKET sockopt SO_TIMESTAMPNS. This command is similar to SO_TIMESTAMP, but permits transmission of a 'timespec struct' instead of a 'timeval struct' control message. (nanosecond resolution instead of microsecond) Control message is labelled SCM_TIMESTAMPNS instead of SCM_TIMESTAMP A socket cannot mix SO_TIMESTAMP and SO_TIMESTAMPNS : the two modes are mutually exclusive. sock_recv_timestamp() became too big to be fully inlined so I added a __sock_recv_timestamp() helper function. Signed-off-by: Eric Dumazet <dada1@cosmosbay.com> CC: linux-arch@vger.kernel.org Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/compat.c')
-rw-r--r--net/compat.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/net/compat.c b/net/compat.c
index 0e407563ae85..9a0f5f2b90c8 100644
--- a/net/compat.c
+++ b/net/compat.c
@@ -215,6 +215,7 @@ Efault:
215int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data) 215int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data)
216{ 216{
217 struct compat_timeval ctv; 217 struct compat_timeval ctv;
218 struct compat_timespec cts;
218 struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control; 219 struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
219 struct compat_cmsghdr cmhdr; 220 struct compat_cmsghdr cmhdr;
220 int cmlen; 221 int cmlen;
@@ -229,7 +230,14 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
229 ctv.tv_sec = tv->tv_sec; 230 ctv.tv_sec = tv->tv_sec;
230 ctv.tv_usec = tv->tv_usec; 231 ctv.tv_usec = tv->tv_usec;
231 data = &ctv; 232 data = &ctv;
232 len = sizeof(struct compat_timeval); 233 len = sizeof(ctv);
234 }
235 if (level == SOL_SOCKET && type == SO_TIMESTAMPNS) {
236 struct timespec *ts = (struct timespec *)data;
237 cts.tv_sec = ts->tv_sec;
238 cts.tv_nsec = ts->tv_nsec;
239 data = &cts;
240 len = sizeof(cts);
233 } 241 }
234 242
235 cmlen = CMSG_COMPAT_LEN(len); 243 cmlen = CMSG_COMPAT_LEN(len);