[PATCH] rfcomm/sock: fix build problem

[PATCH] rfcomm/sock: fix build problem

[Alexander Beregalov]

net/bluetooth/rfcomm/sock.c: In function 'rfcomm_sock_ioctl':
net/bluetooth/rfcomm/sock.c:795: error: 'sk' undeclared (first use in this function)
net/bluetooth/rfcomm/sock.c:795: error: (Each undeclared identifier is reported only once
net/bluetooth/rfcomm/sock.c:795: error: for each function it appears in.)

It is a conflict between a418b893
(Bluetooth: Enable per-module dynamic debug messages)
and 45555c0e
(bluetooth: fix warning in net/bluetooth/rfcomm/sock.c)

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
---

 net/bluetooth/rfcomm/sock.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
index ad00cbf..d63040f 100644
--- a/net/bluetooth/rfcomm/sock.c
+++ b/net/bluetooth/rfcomm/sock.c
@@ -787,9 +787,7 @@ static int rfcomm_sock_getsockopt(struct socket *sock, int level, int optname, c
 
 static int rfcomm_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 {
-#if defined(CONFIG_BT_RFCOMM_TTY) || defined(CONFIG_BT_RFCOMM_DEBUG)
 	struct sock *sk = sock->sk;
-#endif
 	int err;
 
 	BT_DBG("sk %p cmd %x arg %lx", sk, cmd, arg);

Re: [PATCH] rfcomm/sock: fix build problem

[David Miller]

From: Alexander Beregalov <a.beregalov@gmail.com>
Date: Tue, 9 Dec 2008 15:39:50 +0300

> net/bluetooth/rfcomm/sock.c: In function 'rfcomm_sock_ioctl':
> net/bluetooth/rfcomm/sock.c:795: error: 'sk' undeclared (first use in this function)
> net/bluetooth/rfcomm/sock.c:795: error: (Each undeclared identifier is reported only once
> net/bluetooth/rfcomm/sock.c:795: error: for each function it appears in.)
> 
> It is a conflict between a418b893
> (Bluetooth: Enable per-module dynamic debug messages)
> and 45555c0e
> (bluetooth: fix warning in net/bluetooth/rfcomm/sock.c)
> 
> Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>

Already fixed in net-next-2.6.

BTW, your patch reintroduces a warning.