aboutsummaryrefslogtreecommitdiff
path: root/net/bluetooth/a2mp.c
diff options
context:
space:
mode:
authorAndrei Emeltchenko <andrei.emeltchenko@intel.com>2012-05-31 11:01:37 +0300
committerJohan Hedberg <johan.hedberg@intel.com>2012-06-05 06:34:14 +0300
commit3cabbfdad3150e0083a64c951701c970ef970c77 (patch)
tree06cac37ffdf14a90f19d1712418a1ef9d0ffce97 /net/bluetooth/a2mp.c
parentfd83e2c27c1bd8b0e9dc7596339c2411385f8b0c (diff)
Bluetooth: A2MP: Do not reference hci_conn
Make A2MP channel special channel which do not reference hci_conn. This prevents from keeping ACL connection open when all L2CAP channels got closed. hci_conn_hold and hci_conn_put are not reference counts on the hci_conn structure in the typical way. They are reference counts for the ACL. When you do the last hci_conn_put, the ACL is disconnected after a timeout. Reported-by: Mat Martineau <mathewm@codeaurora.org> Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth/a2mp.c')
-rw-r--r--net/bluetooth/a2mp.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/bluetooth/a2mp.c b/net/bluetooth/a2mp.c
index e08ca2ac31a..0772c680abe 100644
--- a/net/bluetooth/a2mp.c
+++ b/net/bluetooth/a2mp.c
@@ -481,8 +481,6 @@ static struct l2cap_chan *a2mp_chan_open(struct l2cap_conn *conn)
BT_DBG("chan %p", chan);
- hci_conn_hold(conn->hcon);
-
chan->chan_type = L2CAP_CHAN_CONN_FIX_A2MP;
chan->flush_to = L2CAP_DEFAULT_FLUSH_TO;