Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=1da97f83a843f92678b614fcaebdb3e4ebd6c9dd
Commit:     1da97f83a843f92678b614fcaebdb3e4ebd6c9dd
Parent:     577107e8e4cf9f6f4f5ef8350ac9a8faa6c3796d
Author:     David S. Miller <[EMAIL PROTECTED](none)>
AuthorDate: Wed Sep 12 14:10:58 2007 +0200
Committer:  David S. Miller <[EMAIL PROTECTED](none)>
CommitDate: Wed Sep 12 14:10:58 2007 +0200

    [BLUETOOTH]: Fix non-COMPAT build of hci_sock.c
    
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 net/bluetooth/hci_sock.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index d16ca8e..5ccea5f 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);
        }
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to