From 773f0df0dfe2017dad7f34dc7077e209bf2cb275 Mon Sep 17 00:00:00 2001
From: Shaun Pereira <spereira@tusc.com.au>
Date: Tue, 21 Mar 2006 23:59:39 -0800
Subject: [PATCH] --- yaml --- r: 22660 b: refs/heads/master c:
 f0ac2614412e2b597e2d5bfbd3960b4f73718b41 h: refs/heads/master v: v3

---
 [refs]                     |  2 +-
 trunk/include/net/compat.h |  4 +++-
 trunk/net/compat.c         | 19 +++++++++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e557d78581dc..c1b6a6722a8d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89bbfc95d65839d6ae23ddab8a3cc5af4ae88383
+refs/heads/master: f0ac2614412e2b597e2d5bfbd3960b4f73718b41
diff --git a/trunk/include/net/compat.h b/trunk/include/net/compat.h
index 290bab46d457..8662b8f43df5 100644
--- a/trunk/include/net/compat.h
+++ b/trunk/include/net/compat.h
@@ -23,6 +23,9 @@ struct compat_cmsghdr {
 	compat_int_t	cmsg_type;
 };
 
+struct sock;
+extern int compat_sock_get_timestamp(struct sock *, struct timeval __user *);
+
 #else /* defined(CONFIG_COMPAT) */
 #define compat_msghdr	msghdr		/* to avoid compiler warnings */
 #endif /* defined(CONFIG_COMPAT) */
@@ -34,7 +37,6 @@ extern asmlinkage long compat_sys_recvmsg(int,struct compat_msghdr __user *,unsi
 extern asmlinkage long compat_sys_getsockopt(int, int, int, char __user *, int __user *);
 extern int put_cmsg_compat(struct msghdr*, int, int, int, void *);
 
-struct sock;
 extern int cmsghdr_from_user_compat_to_kern(struct msghdr *, struct sock *, unsigned char *, int);
 
 #endif /* NET_COMPAT_H */
diff --git a/trunk/net/compat.c b/trunk/net/compat.c
index 13177a1a4b39..8fd37cd7b501 100644
--- a/trunk/net/compat.c
+++ b/trunk/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)
 {