[BLUETOOTH]: Fix non-COMPAT build of hci_sock.c

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index d16ca8e..5ccea5f 100644 (file)
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -348,16 +348,17 @@ static inline void hci_sock_cmsg(struct sock *sk, struct msghdr *msg, struct sk_
 
                skb_get_timestamp(skb, &tv);
 
+               data = &tv;
+               len = sizeof(tv);
+#ifdef CONFIG_COMPAT
                if (msg->msg_flags & MSG_CMSG_COMPAT) {
                        struct compat_timeval ctv;
                        ctv.tv_sec = tv.tv_sec;
                        ctv.tv_usec = tv.tv_usec;
                        data = &ctv;
                        len = sizeof(ctv);
-               } else {
-                       data = &tv;
-                       len = sizeof(tv);
                }
+#endif
 
                put_cmsg(msg, SOL_HCI, HCI_CMSG_TSTAMP, len, data);
        }