2009-01-23 09:41:49

by Daniele Venzano

Subject: [PATCH] Fix unused variable warning in rfcomm

The following patch fixes a warning generated when compiling rfcomm.c
without CONFIG_BT_RFCOMM_DEBUG.
The warning was:
net/bluetooth/rfcomm/sock.c: In function ‘rfcomm_sock_ioctl’:
net/bluetooth/rfcomm/sock.c:795: warning: unused variable ‘sk’

Patch is against 2.6.28.1

Signed-off-by: Daniele Venzano <[email protected]>

--- a/net/bluetooth/rfcomm/sock.c 2009-01-23 10:30:34.000000000 +0100
+++ b/net/bluetooth/rfcomm/sock.c 2009-01-23 10:31:25.000000000 +0100
@@ -792,7 +792,9 @@ static int rfcomm_sock_getsockopt(struct

static int rfcomm_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
{
+#ifdef CONFIG_BT_RFCOMM_DEBUG
struct sock *sk = sock->sk;
+#endif
int err;

BT_DBG("sk %p cmd %x arg %lx", sk, cmd, arg);

2009-01-23 13:50:13

by Richard Genoud

Subject: Re: [PATCH] Fix unused variable warning in rfcomm

2009/1/23 Daniele Venzano <[email protected]>:
> The following patch fixes a warning generated when compiling rfcomm.c
> without CONFIG_BT_RFCOMM_DEBUG.
> The warning was:
> net/bluetooth/rfcomm/sock.c: In function 'rfcomm_sock_ioctl':
> net/bluetooth/rfcomm/sock.c:795: warning: unused variable 'sk'
>
> Patch is against 2.6.28.1
>
> Signed-off-by: Daniele Venzano <[email protected]>
>
> --- a/net/bluetooth/rfcomm/sock.c 2009-01-23 10:30:34.000000000 +0100
> +++ b/net/bluetooth/rfcomm/sock.c 2009-01-23 10:31:25.000000000 +0100
> @@ -792,7 +792,9 @@ static int rfcomm_sock_getsockopt(struct
>
> static int rfcomm_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
> {
> +#ifdef CONFIG_BT_RFCOMM_DEBUG
> struct sock *sk = sock->sk;
> +#endif
> int err;
>
> BT_DBG("sk %p cmd %x arg %lx", sk, cmd, arg);
>

if CONFIG_BT_RFCOMM_TTY is set, the compilation will break.

richard.