Provides a 32 bit conversion function for SIOCGSTAMP
diff -uprN -X dontdiff linux-2.6.15-vanilla/include/net/compat.h
linux-2.6.15/include/net/compat.h
--- linux-2.6.15-vanilla/include/net/compat.h   2006-01-03
14:21:10.000000000 +1100
+++ linux-2.6.15/include/net/compat.h   2006-01-17 09:52:50.000000000
+1100
@@ -23,6 +23,8 @@ struct compat_cmsghdr {
        compat_int_t    cmsg_type;
 };
 
+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) */
diff -uprN -X dontdiff linux-2.6.15-vanilla/net/compat.c
linux-2.6.15/net/compat.c
--- linux-2.6.15-vanilla/net/compat.c   2006-01-03 14:21:10.000000000
+1100
+++ linux-2.6.15/net/compat.c   2006-01-17 09:52:50.000000000 +1100
@@ -503,6 +503,23 @@ static int do_get_sock_timeout(int fd, i
        return err;
 }
 
+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;
+}
+
 asmlinkage long compat_sys_getsockopt(int fd, int level, int optname,
                                char __user *optval, int __user *optlen)
 {
@@ -602,3 +619,5 @@ asmlinkage long compat_sys_socketcall(in
        }
        return ret;
 }
+
+EXPORT_SYMBOL(compat_sock_get_timestamp);

-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to