lkml.org 
[lkml]   [2012]   [Feb]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 10/30] compat: Use COMPAT_USE_64BIT_TIME in the Bluetooth subsystem
    Date
    From: "H. J. Lu" <hjl.tools@gmail.com>

    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>
    ---
    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 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;
    --
    1.7.6.5


    \
     
     \ /
      Last update: 2012-02-20 01:15    [W:0.021 / U:29.744 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site