Re: hci_sock.c build failure

[Coly Li]

David Miller åé:
> From: Greg KH <greg@xxxxxxxxx>
> Date: Wed, 12 Sep 2007 05:02:53 -0700
> 
>> It's not even a randconfig issue, my build dies too (this is Linus's
>> current tree.)
>>
>> Time to poke through the 10 bluetooth patches that were just added...
> 
> I'll push the following fix to Linus.
> 
> From 1da97f83a843f92678b614fcaebdb3e4ebd6c9dd Mon Sep 17 00:00:00 2001
> From: David S. Miller <davem@kimchee.(none)>
> Date: Wed, 12 Sep 2007 14:10:58 +0200
> Subject: [PATCH] [BLUETOOTH]: Fix non-COMPAT build of hci_sock.c
> 
> Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
> ---
>  net/bluetooth/hci_sock.c |    7 ++++---
>  1 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
> index d16ca8e..5ccea5f 100644
> --- a/net/bluetooth/hci_sock.c
> +++ b/net/bluetooth/hci_sock.c
> @@ -348,16 +348,17 @@ static inline void hci_sock_cmsg(struct sock *sk, struct msghdr *msg, struct sk_
>  
>  		skb_get_timestamp(skb, &tv);
>  
> +		data = &tv;
> +		len = sizeof(tv);
> +#ifdef CONFIG_COMPAT
>  		if (msg->msg_flags & MSG_CMSG_COMPAT) {
>  			struct compat_timeval ctv;
>  			ctv.tv_sec = tv.tv_sec;
>  			ctv.tv_usec = tv.tv_usec;
>  			data = &ctv;
>  			len = sizeof(ctv);
should we consider the condition that msg->msg_flags & MSG_CMSG_COMPAT comes to true when
CONFIG_COMPAT is not defined ?

> -		} else {
> -			data = &tv;
> -			len = sizeof(tv);
>  		}
> +#endif
>  
>  		put_cmsg(msg, SOL_HCI, HCI_CMSG_TSTAMP, len, data);
>  	}

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/