summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorH. J. Lu <hjl.tools@gmail.com>2012-02-10 14:12:15 -0800
committerH. Peter Anvin <hpa@zytor.com>2012-02-20 12:48:47 -0800
commitda88cea1200b9df65a7811a3920aa5a4be7dab9f (patch)
treeb6b8e783bd6a32cd6d6e58a2289645ca6f6f909b /net
parentf930a7a0f4c87bf3ee731383421ebf3164009ee7 (diff)
downloadop-kernel-dev-da88cea1200b9df65a7811a3920aa5a4be7dab9f.zip
op-kernel-dev-da88cea1200b9df65a7811a3920aa5a4be7dab9f.tar.gz
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.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index 0dcc962..b2eb2b9 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;
OpenPOWER on IntegriCloud