aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrei Emeltchenko <andrei.emeltchenko@nokia.com>2011-03-24 17:16:08 +0200
committerGustavo F. Padovan <padovan@profusion.mobi>2011-03-24 17:04:44 -0300
commita0cc9a1b5712ea52aaa4e7abfa0ec2dbe0d820ff (patch)
tree363e07ed161173be06e736ea4f38ef7b32b8ab94
parent6994ca5e8ade57d18b7d1e05aad040c441a2ad37 (diff)
downloadkernel_samsung_espresso10-a0cc9a1b5712ea52aaa4e7abfa0ec2dbe0d820ff.zip
kernel_samsung_espresso10-a0cc9a1b5712ea52aaa4e7abfa0ec2dbe0d820ff.tar.gz
kernel_samsung_espresso10-a0cc9a1b5712ea52aaa4e7abfa0ec2dbe0d820ff.tar.bz2
Bluetooth: delete hanging L2CAP channel
Sometimes L2CAP connection remains hanging. Make sure that L2CAP channel is deleted. Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@nokia.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
-rw-r--r--net/bluetooth/l2cap_sock.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index fc85e7a..f77308e 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -923,8 +923,9 @@ void __l2cap_sock_close(struct sock *sk, int reason)
rsp.status = cpu_to_le16(L2CAP_CS_NO_INFO);
l2cap_send_cmd(conn, l2cap_pi(sk)->ident,
L2CAP_CONN_RSP, sizeof(rsp), &rsp);
- } else
- l2cap_chan_del(sk, reason);
+ }
+
+ l2cap_chan_del(sk, reason);
break;
case BT_CONNECT: