aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorShaun Pereira <spereira@tusc.com.au>2006-03-21 23:59:39 -0800
committerDavid S. Miller <davem@davemloft.net>2006-03-21 23:59:39 -0800
commitf0ac2614412e2b597e2d5bfbd3960b4f73718b41 (patch)
treeb1d6c3fabc0f143eec1dcb1ce7c5f6d2bcb64ee1 /net
parent89bbfc95d65839d6ae23ddab8a3cc5af4ae88383 (diff)
downloadlinux-f0ac2614412e2b597e2d5bfbd3960b4f73718b41.tar.gz
[NET]: socket timestamp 32 bit handler for 64 bit kernel
Get socket timestamp handler function that does not use the ioctl32_hash_table. Signed-off-by: Shaun Pereira <spereira@tusc.com.au> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/compat.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/net/compat.c b/net/compat.c
index 13177a1a4b3..8fd37cd7b50 100644
--- a/net/compat.c
+++ b/net/compat.c
@@ -543,6 +543,25 @@ static int compat_sock_getsockopt(struct socket *sock, int level, int optname,
return sock_getsockopt(sock, level, optname, optval, optlen);
}
+int compat_sock_get_timestamp(struct sock *sk, struct timeval __user *userstamp)
+{
+ struct compat_timeval __user *ctv =
+ (struct compat_timeval __user*) userstamp;
+ int err = -ENOENT;
+
+ if (!sock_flag(sk, SOCK_TIMESTAMP))
+ sock_enable_timestamp(sk);
+ if (sk->sk_stamp.tv_sec == -1)
+ return err;
+ if (sk->sk_stamp.tv_sec == 0)
+ do_gettimeofday(&sk->sk_stamp);
+ if (put_user(sk->sk_stamp.tv_sec, &ctv->tv_sec) ||
+ put_user(sk->sk_stamp.tv_usec, &ctv->tv_usec))
+ err = -EFAULT;
+ return err;
+}
+EXPORT_SYMBOL(compat_sock_get_timestamp);
+
asmlinkage long compat_sys_getsockopt(int fd, int level, int optname,
char __user *optval, int __user *optlen)
{