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

Commit da88cea1 authored by H. J. Lu's avatar H. J. Lu Committed by H. Peter Anvin
Browse files

compat: Use COMPAT_USE_64BIT_TIME in the Bluetooth subsystem 



Enable the Bluetooth subsystem to be used with a compat ABI with
64-bit time.

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
Cc: Marcel Holtmann <marcel@holtmann.org>
Cc: Gustavo F. Padovan <padovan@profusion.mobi>
Cc: David S. Miller <davem@davemloft.net>
parent f930a7a0

net/bluetooth/hci_sock.c

+2 −1
Original line number Diff line number Diff line
@@ -418,7 +418,8 @@ static inline void hci_sock_cmsg(struct sock *sk, struct msghdr *msg, struct sk_ 
		data = &tv;

		len = sizeof(tv);

#ifdef CONFIG_COMPAT

		if (msg->msg_flags & MSG_CMSG_COMPAT) {

		if (!COMPAT_USE_64BIT_TIME &&

		    (msg->msg_flags & MSG_CMSG_COMPAT)) {

			ctv.tv_sec = tv.tv_sec;

			ctv.tv_usec = tv.tv_usec;

			data = &ctv;