diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-28 00:57:28 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-28 00:57:28 -0800 |
| commit | 46976c042ba1ff59253f2f7a513099175c24794e (patch) | |
| tree | a7af3f1c3ef2a2d430c49fb774ab744c296a2285 /net/bluetooth/hci_sock.c | |
| parent | 024c378f0b719d43b01b875caefa19f2612e103a (diff) | |
| parent | f6e623a65cb301088bd04794043e82bfc996c512 (diff) | |
| download | op-kernel-dev-46976c042ba1ff59253f2f7a513099175c24794e.zip op-kernel-dev-46976c042ba1ff59253f2f7a513099175c24794e.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6
Diffstat (limited to 'net/bluetooth/hci_sock.c')
| -rw-r--r-- | net/bluetooth/hci_sock.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c index 688cfeb..38f08f6 100644 --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c @@ -329,6 +329,9 @@ static inline void hci_sock_cmsg(struct sock *sk, struct msghdr *msg, struct sk_ } if (mask & HCI_CMSG_TSTAMP) { +#ifdef CONFIG_COMPAT + struct compat_timeval ctv; +#endif struct timeval tv; void *data; int len; @@ -339,7 +342,6 @@ static inline void hci_sock_cmsg(struct sock *sk, struct msghdr *msg, struct sk_ 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; |
