Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [BLUETOOTH]: Fix non-COMPAT build of hci_sock.c

1 files changed, 4 insertions, 3 deletions

diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index d16ca8e53700..5ccea5fbd236 100644
--- 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);
         }