leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [BLUETOOTH]: Fix non-COMPAT build of hci_sock.c
This commit is contained in:
Linus Torvalds 2007-09-12 08:17:30 -07:00
commit 0bc73c253e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/bluetooth/hci_sock.c
View File

@ -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);
} }