Skip to content

L
linux-davinci
Commit 1da97f83 authored by David S. Miller's avatar David S. Miller
Browse files
Options

[BLUETOOTH]: Fix non-COMPAT build of hci_sock.c 

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 577107e8
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
net/bluetooth/hci_sock.c
View file @ 1da97f83
...@@ -348,16 +348,17 @@ static inline void hci_sock_cmsg(struct sock *sk, struct msghdr *msg, struct sk_ ...@@ -348,16 +348,17 @@ static inline void hci_sock_cmsg(struct sock *sk, struct msghdr *msg, struct sk_
skb_get_timestamp(skb, &tv); skb_get_timestamp(skb, &tv);
data = &tv;
len = sizeof(tv);
#ifdef CONFIG_COMPAT
if (msg->msg_flags & MSG_CMSG_COMPAT) { if (msg->msg_flags & MSG_CMSG_COMPAT) {
struct compat_timeval ctv; struct compat_timeval ctv;
ctv.tv_sec = tv.tv_sec; ctv.tv_sec = tv.tv_sec;
ctv.tv_usec = tv.tv_usec; ctv.tv_usec = tv.tv_usec;
data = &ctv; data = &ctv;
len = sizeof(ctv); len = sizeof(ctv);
} else {
data = &tv;
len = sizeof(tv);
} }
#endif
put_cmsg(msg, SOL_HCI, HCI_CMSG_TSTAMP, len, data); put_cmsg(msg, SOL_HCI, HCI_CMSG_TSTAMP, len, data);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment