From: Andrew Morton Cc: Shaun Pereira Cc: Arnd Bergmann Signed-off-by: Andrew Morton --- net/compat.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff -puN net/compat.c~net-socket-timestamp-32-bit-handler-for-64-bit-kernel-tidy net/compat.c --- devel/net/compat.c~net-socket-timestamp-32-bit-handler-for-64-bit-kernel-tidy 2006-02-17 00:41:02.000000000 -0800 +++ devel-akpm/net/compat.c 2006-02-17 00:41:02.000000000 -0800 @@ -505,20 +505,22 @@ static int do_get_sock_timeout(int fd, i int compat_sock_get_timestamp(struct sock *sk, struct timeval __user *userstamp) { - struct compat_timeval __user *ctv - = (struct compat_timeval __user*) userstamp; + struct compat_timeval __user *ctv = + (struct compat_timeval __user*) userstamp; int err = -ENOENT; - if(!sock_flag(sk, SOCK_TIMESTAMP)) + + if (!sock_flag(sk, SOCK_TIMESTAMP)) sock_enable_timestamp(sk); - if(sk->sk_stamp.tv_sec == -1) + if (sk->sk_stamp.tv_sec == -1) return err; - if(sk->sk_stamp.tv_sec == 0) + if (sk->sk_stamp.tv_sec == 0) do_gettimeofday(&sk->sk_stamp); - if (put_user(sk->sk_stamp.tv_sec, &ctv->tv_sec) | + if (put_user(sk->sk_stamp.tv_sec, &ctv->tv_sec) || put_user(sk->sk_stamp.tv_usec, &ctv->tv_usec)) - err = -EFAULT; + 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) @@ -619,5 +621,3 @@ asmlinkage long compat_sys_socketcall(in } return ret; } - -EXPORT_SYMBOL(compat_sock_get_timestamp); _