diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2014-08-18 21:33:27 +0400 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2014-09-08 21:07:54 +0400 |
| commit | bcbb655a180344d8004ede669228992bff1921e4 (patch) | |
| tree | 10abc4c141ed33a522ee725b8d492178e0c9214d /net/bluetooth/hci_conn.c | |
| parent | f94b665dcf15324f5ac8aa639e47be0829b6409d (diff) | |
| download | linux-bcbb655a180344d8004ede669228992bff1921e4.tar.xz | |
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>
Diffstat (limited to 'net/bluetooth/hci_conn.c')
| -rw-r--r-- | net/bluetooth/hci_conn.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index aaa7e388d026..5157a0990732 100644 --- 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); |