Bluetooth: rename hci_conn_put to hci_conn_drop

We use _get() and _put() for device ref-counting in the kernel. However,
hci_conn_put() is _not_ used for ref-counting, hence, rename it to
hci_conn_drop() so we can later fix ref-counting and introduce
hci_conn_put().

hci_conn_hold() and hci_conn_put() are currently used to manage how long a
connection should be held alive. When the last user drops the connection,
we spawn a delayed work that performs the disconnect. Obviously, this has
nothing to do with ref-counting for the _object_ but rather for the
keep-alive of the connection.

But we really _need_ proper ref-counting for the _object_ to allow
connection-users like rfcomm-tty, HIDP or others.

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

1 files changed, 3 insertions, 3 deletions

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 7c7e9321f1ea..7cdb93c21b32 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -571,7 +571,7 @@ void l2cap_chan_del(struct l2cap_chan *chan, int err)
                 chan->conn = NULL;
 
                 if (chan->chan_type != L2CAP_CHAN_CONN_FIX_A2MP)
-                        hci_conn_put(conn->hcon);
+                        hci_conn_drop(conn->hcon);
 
                 if (mgr && mgr->bredr_chan == chan)
                         mgr->bredr_chan = NULL;
@@ -1697,7 +1697,7 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,
 
         conn = l2cap_conn_add(hcon, 0);
         if (!conn) {
-                hci_conn_put(hcon);
+                hci_conn_drop(hcon);
                 err = -ENOMEM;
                 goto done;
         }
@@ -1707,7 +1707,7 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,
 
                 if (!list_empty(&conn->chan_l)) {
                         err = -EBUSY;
-                        hci_conn_put(hcon);
+                        hci_conn_drop(hcon);
                 }
 
                 if (err)