---

yaml --- r: 297711 b: refs/heads/master c: da88cea h: refs/heads/master i: 297709: 592fd0a 297707: 5afb025 297703: 729d767 297695: 036bbfb v: v3
git-mirror · Feb 20, 2012 · bf321e2 · bf321e2
1 parent db1213d
commit bf321e2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f930a7a0f4c87bf3ee731383421ebf3164009ee7
+refs/heads/master: da88cea1200b9df65a7811a3920aa5a4be7dab9f
diff --git a/trunk/net/bluetooth/hci_sock.c b/trunk/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;