Bluetooth: Remove hci_conn_hold/drop from hci_chan

We can't have hci_chan contribute to the "active" reference counting of
the hci_conn since otherwise the connection would never get dropped when
there are no more users (since hci_chan would be counted as a user).
This patch removes hold() when creating the hci_chan and drop() when
destroying it.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index aaa7e388d026f2d192a7b20b895f2ec690dc34e7..5157a09907327f8ca023e1c4c157fb148208e279 100644 (file)
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -1301,7 +1301,6 @@ struct hci_chan *hci_chan_create(struct hci_conn *conn)
                return NULL;
 
        chan->conn = hci_conn_get(conn);
-       hci_conn_hold(conn);
        skb_queue_head_init(&chan->data_q);
        chan->state = BT_CONNECTED;
 
@@ -1321,11 +1320,9 @@ void hci_chan_del(struct hci_chan *chan)
 
        synchronize_rcu();
 
-       /* Force the connection to be immediately dropped */
-       conn->disc_timeout = 0;
+       /* Prevent new hci_chan's to be created for this hci_conn */
        set_bit(HCI_CONN_DROP, &conn->flags);
 
-       hci_conn_drop(conn);
        hci_conn_put(conn);
 
        skb_queue_purge(&chan->data_q);