diff options
| author | H. J. Lu | 2012-02-10 23:12:15 +0100 |
|---|---|---|
| committer | H. Peter Anvin | 2012-02-20 21:48:47 +0100 |
| commit | da88cea1200b9df65a7811a3920aa5a4be7dab9f (patch) | |
| tree | b6b8e783bd6a32cd6d6e58a2289645ca6f6f909b /net | |
| parent | compat: Use COMPAT_USE_64BIT_TIME in the input subsystem (diff) | |
| download | kernel-qcow2-linux-da88cea1200b9df65a7811a3920aa5a4be7dab9f.tar.gz kernel-qcow2-linux-da88cea1200b9df65a7811a3920aa5a4be7dab9f.tar.xz kernel-qcow2-linux-da88cea1200b9df65a7811a3920aa5a4be7dab9f.zip | |
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 <hpa@zytor.com>
Cc: Marcel Holtmann <marcel@holtmann.org>
Cc: Gustavo F. Padovan <padovan@profusion.mobi>
Cc: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/hci_sock.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c index 0dcc96266779..b2eb2b93580f 100644 --- 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; |