[Bluetooth] Small cleanup of the L2CAP source code

[pandora-kernel.git] / net / compat.c

diff --git a/net/compat.c b/net/compat.c
index 13177a1..d5d69fa 100644 (file)
--- a/net/compat.c
+++ b/net/compat.c
@@ -476,8 +476,7 @@ asmlinkage long compat_sys_setsockopt(int fd, int level, int optname,
        int err;
        struct socket *sock;
 
-       /* SO_SET_REPLACE seems to be the same in all levels */
-       if (optname == IPT_SO_SET_REPLACE)
+       if (level == SOL_IPV6 && optname == IPT_SO_SET_REPLACE)
                return do_netfilter_replace(fd, level, optname,
                                            optval, optlen);
 
@@ -543,6 +542,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)
 {