diff options
| author | David S. Miller <davem@kimchee.(none)> | 2007-09-12 14:10:58 +0200 |
|---|---|---|
| committer | David S. Miller <davem@kimchee.(none)> | 2007-09-12 14:10:58 +0200 |
| commit | 1da97f83a843f92678b614fcaebdb3e4ebd6c9dd (patch) | |
| tree | fa4b516c20714b203c42b6e6b8b55811aef7e67a /net/bluetooth/hci_sock.c | |
| parent | 577107e8e4cf9f6f4f5ef8350ac9a8faa6c3796d (diff) | |
| download | kernel_samsung_aries-1da97f83a843f92678b614fcaebdb3e4ebd6c9dd.zip kernel_samsung_aries-1da97f83a843f92678b614fcaebdb3e4ebd6c9dd.tar.gz kernel_samsung_aries-1da97f83a843f92678b614fcaebdb3e4ebd6c9dd.tar.bz2 | |
[BLUETOOTH]: Fix non-COMPAT build of hci_sock.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bluetooth/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 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); } |