diff options
| author |   Andrei Emeltchenko <andrei.emeltchenko@nokia.com> | 2011-03-24 17:16:08 +0200 |
|---|---|---|
| committer |   Gustavo F. Padovan <padovan@profusion.mobi> | 2011-03-31 14:25:26 -0300 |
| commit | 34bd0273b631742e8d929c80e90cb7782105d8da (patch) | |
| tree | c2e74a1782c80231d49cb14e15d20438aa7ee7dc /net/bluetooth/l2cap_sock.c | |
| parent | Bluetooth: Fix missing hci_dev_lock_bh in user_confirm_reply (diff) | |
| download | linux-dev-34bd0273b631742e8d929c80e90cb7782105d8da.tar.xz linux-dev-34bd0273b631742e8d929c80e90cb7782105d8da.zip | |
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>
Diffstat (limited to 'net/bluetooth/l2cap_sock.c')
| -rw-r--r-- | net/bluetooth/l2cap_sock.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index fc85e7ae33c7..f77308e63e58 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: |