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: H. Peter Anvin <[email protected]> Cc: Marcel Holtmann <[email protected]> Cc: Gustavo F. Padovan <[email protected]> Cc: David S. Miller <[email protected]>
kyagi · Feb 20, 2012 · da88cea · da88cea
1 parent f930a7a
commit da88cea
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
@@ -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;