Bluetooth: hci_core: Fix sending MGMT_EV_CONNECT_FAILED
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH 1/1 Bluetooth: hci_core: Fix sending MGMT_EV_CONNECT_FAILED
From: Luiz Augusto von Dentz <[email protected]>
If HCI_CONN_MGMT_CONNECTED has been set then the event shall be HCI_CONN_MGMT_DISCONNECTED.
Fixes b644ba336997 ("Bluetooth: Update device_connected and device_found events to latest API")
Signed-off-by Luiz Augusto von Dentz <[email protected]>
--- include/net/bluetooth/hci_core.h | 4 ++-- net/bluetooth/hci_conn.c | 6 ++---- net/bluetooth/mgmt.c | 13 +++++++++---- 3 files changed, 13 insertions(+), 10 deletions(-)
include/net/bluetooth/hci_core.h +2 -2
@@ -2257,8 +2257,8 @@ void mgmt_device_disconnected(struct hci_dev *hdev, bdaddr_t *bdaddr, bool mgmt_connected);void mgmt_disconnect_failed (struct hci_dev *hdev,bdaddr_t *bdaddr,u8 link_type,u8 addr_type,u8 status); -void mgmt_connect_failed (struct hci_dev *hdev,bdaddr_t *bdaddr,u8 link_type, -u8 addr_type,u8 status); +void mgmt_connect_failed (struct hci_dev *hdev,struct hci_conn *conn, +u8 status);void mgmt_pin_code_request (struct hci_dev *hdev,bdaddr_t *bdaddr,u8 secure);void mgmt_pin_code_reply_complete (struct hci_dev *hdev,bdaddr_t *bdaddr,u8 status);
net/bluetooth/hci_conn.c +2 -4
@@ -106,8 +106,7 @@ void hci_connect_le_scan_cleanup(struct hci_conn *conn, u8 status)* where a timeout + cancel does indicate an actual failure. */ if (status && status !=HCI_ERROR_UNKNOWN_CONN_ID ) -mgmt_connect_failed (hdev, &conn->dst, conn->type, - conn->dst_type, status); +mgmt_connect_failed (hdev, conn, status);/* The connection attempt was doing scan for new RPA, and is * in scan phase. If params are not associated with any other
@@ -1249,8 +1248,7 @@ void hci_conn_failed(struct hci_conn *conn, u8 status)hci_le_conn_failed (conn, status);break ;case ACL_LINK : -mgmt_connect_failed (hdev, &conn->dst, conn->type, - conn->dst_type, status); +mgmt_connect_failed (hdev, conn, status);break ; }
net/bluetooth/mgmt.c +9 -4
@@ -9779,13 +9779,18 @@ void mgmt_disconnect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr,mgmt_pending_remove (cmd); } -void mgmt_connect_failed (struct hci_dev *hdev,bdaddr_t *bdaddr,u8 link_type, -u8 addr_type,u8 status) +void mgmt_connect_failed (struct hci_dev *hdev,struct hci_conn *conn,u8 status) {struct mgmt_ev_connect_failed ev; -bacpy (&ev.addr.bdaddr, bdaddr); - ev.addr.type =link_to_bdaddr (link_type, addr_type); +if (test_and_clear_bit (HCI_CONN_MGMT_CONNECTED , &conn->flags)) { +mgmt_device_disconnected (hdev, &conn->dst, conn->type, + conn->dst_type, status, true); +return ; + } + +bacpy (&ev.addr.bdaddr, &conn->dst); + ev.addr.type =link_to_bdaddr (conn->type, conn->dst_type); ev.status =mgmt_status (status);mgmt_event (MGMT_EV_CONNECT_FAILED , hdev, &ev,sizeof (ev),NULL );
Signature · 1 line
2.46.0
This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Hello:
This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Quoted 9 lines · On Fri, 30 Aug 2024 17:38:35 -0400 you wrote:
From: Luiz Augusto von Dentz <[email protected]>
If
HCI_CONN_MGMT_CONNECTEDhas been set then the event shall beHCI_CONN_MGMT_DISCONNECTED.Fixes b644ba336997 ("Bluetooth: Update device_connected and device_found events to latest API")Signed-off-by Luiz Augusto von Dentz <[email protected]>[...]
Here is the summary with links:
- [v1] Bluetooth: hci_core: Fix sending MGMT_EV_CONNECT_FAILED
https://git.kernel.org/bluetooth/bluetooth-next/c/6efcec8031c4
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html