diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-12 08:17:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-12 08:17:30 -0700 |
| commit | 0bc73c253ebb0430a6b6eb32765aac582fe263c5 (patch) | |
| tree | 424026b3487e85fc88e996284f59f3e3867a14ed | |
| parent | 040a2b6b596f51b0646c9631e29e73559341d5d3 (diff) | |
| parent | 1da97f83a843f92678b614fcaebdb3e4ebd6c9dd (diff) | |
| download | linux-0bc73c253ebb0430a6b6eb32765aac582fe263c5.tar.bz2 | |
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
| -rw-r--r-- | 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 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); } |