Re: linux-next: net tree build failure

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>
Cc: linux-next@vger.kernel.org, marcel@holtmann.org, rmk@arm.linux.org.uk
Subject: Re: linux-next: net tree build failure
Date: Tue, 9 Dec 2008 19:54:17 +1100	[thread overview]
Message-ID: <20081209195417.1b671249.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20081209.000423.18106461.davem@davemloft.net>

[-- Attachment #1: Type: text/plain, Size: 1133 bytes --]

Hi Dave,

On Tue, 09 Dec 2008 00:04:23 -0800 (PST) David Miller <davem@davemloft.net> wrote:
>
> I just pushed the following fix for this, thanks Stephen:
> 
> bluetooth: Fix rfcomm_sock_ioctl() build failure with debugging enabled.
> 
> It's 'sock' not 'sk'.
> 
> Signed-off-by: David S. Miller <davem@davemloft.net>
> ---
>  net/bluetooth/rfcomm/sock.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
> index ad00cbf..ffaa6b0 100644
> --- a/net/bluetooth/rfcomm/sock.c
> +++ b/net/bluetooth/rfcomm/sock.c
> @@ -792,7 +792,7 @@ static int rfcomm_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned lon
>  #endif
>  	int err;
>  
> -	BT_DBG("sk %p cmd %x arg %lx", sk, cmd, arg);
> +	BT_DBG("sk %p cmd %x arg %lx", sock, cmd, arg);

I am not sure this is correct as there is a "sk" defined just above here
but surrounded by

#if defined(CONFIG_BT_RFCOMM_TTY) || defined(CONFIG_BT_RFCOMM_DEBUG)

?
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]