diff options
| author |   Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2022-10-17 15:36:23 -0700 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2022-11-02 14:16:09 -0700 |
| commit | 5638d9ea9c01c77fc11693d48cf719bc7e88f224 (patch) | |
| tree | 205ed2feaae4f41a0e7252e898113aa7cfdad7a2 | |
| parent | Bluetooth: L2CAP: Fix memory leak in vhci_write (diff) | |
| download | linux-dev-5638d9ea9c01c77fc11693d48cf719bc7e88f224.tar.xz linux-dev-5638d9ea9c01c77fc11693d48cf719bc7e88f224.zip | |
Bluetooth: hci_conn: Fix not restoring ISO buffer count on disconnect
When disconnecting an ISO link the controller may not generate
HCI_EV_NUM_COMP_PKTS for unacked packets which needs to be restored in
hci_conn_del otherwise the host would assume they are still in use and
would not be able to use all the buffers available.
Fixes: 26afbd826ee3 ("Bluetooth: Add initial implementation of CIS connections")
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Tested-by: Frédéric Danis <frederic.danis@collabora.com>
| -rw-r--r-- | net/bluetooth/hci_conn.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 1176bad5d833..a6c12863a253 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -1067,10 +1067,21 @@ int hci_conn_del(struct hci_conn *conn) hdev->acl_cnt += conn->sent; } else { struct hci_conn *acl = conn->link; + if (acl) { acl->link = NULL; hci_conn_drop(acl); } + + /* Unacked ISO frames */ + if (conn->type == ISO_LINK) { + if (hdev->iso_pkts) + hdev->iso_cnt += conn->sent; + else if (hdev->le_pkts) + hdev->le_cnt += conn->sent; + else + hdev->acl_cnt += conn->sent; + } } if (conn->amp_mgr) |