Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...

[muen/linux.git] / net / bluetooth / hci_sock.c

diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index d4e2a166ae17685f7445729adf4423c0fbd669b6..d32077b284337ff4086701b0fa5817a173e09d03 100644 (file)
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -1382,9 +1382,9 @@ static void hci_sock_cmsg(struct sock *sk, struct msghdr *msg,
 
        if (mask & HCI_CMSG_TSTAMP) {
 #ifdef CONFIG_COMPAT
-               struct compat_timeval ctv;
+               struct old_timeval32 ctv;
 #endif
-               struct timeval tv;
+               struct __kernel_old_timeval tv;
                void *data;
                int len;