Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bc73c25 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 040a2b6b 1da97f83

net/bluetooth/hci_sock.c

+4 −3
Original line number Diff line number Diff line
@@ -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);

	}