From: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx>
This attempts to make unacked packet handling more robust by detecting
if there are no connections left then restore all buffers of the
respective pool.
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx>
---
net/bluetooth/hci_conn.c | 34 ++++++++++++++++++++++++++++------
1 file changed, 28 insertions(+), 6 deletions(-)
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 9d2324eb1211..d2f0c3c0f0ae 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -1151,22 +1151,44 @@ void hci_conn_del(struct hci_conn *conn)
disable_delayed_work_sync(&conn->auto_accept_work);
disable_delayed_work_sync(&conn->idle_work);
- /* Handle unnacked frames */
+ /* Handle unnacked frames:
+ *
+ * - In case there are no connection restore all buffers to the pool
+ * - Otherwise restore just the buffers considered in transit for the
+ * hci_conn
+ */
switch (conn->type) {
case ACL_LINK:
- hdev->acl_cnt += conn->sent;
+ if (!hci_conn_num(hdev, ACL_LINK))
+ hdev->acl_cnt = hdev->acl_pkts;
+ else
+ hdev->acl_cnt += conn->sent;
break;
case LE_LINK:
cancel_delayed_work(&conn->le_conn_timeout);
- if (hdev->le_pkts)
- hdev->le_cnt += conn->sent;
- else
- hdev->acl_cnt += conn->sent;
+ if (hdev->le_pkts) {
+ if (!hci_conn_num(hdev, LE_LINK))
+ hdev->le_cnt = hdev->le_pkts;
+ else
+ hdev->le_cnt += conn->sent;
+ } else {
+ if (!hci_conn_num(hdev, LE_LINK) &&
+ !hci_conn_num(hdev, ACL_LINK))
+ hdev->acl_cnt = hdev->acl_pkts;
+ else
+ hdev->acl_cnt += conn->sent;
+ }
break;
case CIS_LINK:
case BIS_LINK:
case PA_LINK:
+ if (!hci_conn_num(hdev, CIS_LINK) &&
+ !hci_conn_num(hdev, BIS_LINK) &&
+ !hci_conn_num(hdev, PA_LINK))
+ hdev->iso_cnt = hdev->iso_pkts;
+ else
+ hdev->iso_cnt += conn->sent;
hdev->iso_cnt += conn->sent;
break;
}
--
2.50.1
