Bluetooth: hci_conn: Fix sending BT_HCI_CMD_LE_CREATE_CONN_CANCEL

Commit Message

Luiz Augusto von Dentz Aug. 15, 2023, 10:18 p.m. UTC

From: Luiz Augusto von Dentz <[e-mail]>

This fixes sending BT_HCI_CMD_LE_CREATE_CONN_CANCEL when
hci_le_create_conn_sync has not been called because HCI_CONN_SCANNING
has been clear too early before its cmd_sync callback has been run.

Signed-off-by: Luiz Augusto von Dentz <[e-mail]>
---
 net/bluetooth/hci_conn.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

[e-mail] Aug. 15, 2023, 11:04 p.m. UTC | #1

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=776432

---Test result---

Test Summary:
CheckPatch                    PASS      0.60 seconds
GitLint                       PASS      0.25 seconds
SubjectPrefix                 PASS      0.07 seconds
BuildKernel                   PASS      36.85 seconds
CheckAllWarning               PASS      40.66 seconds
CheckSparse                   PASS      47.48 seconds
CheckSmatch                   PASS      129.79 seconds
BuildKernel32                 PASS      36.58 seconds
TestRunnerSetup               PASS      559.87 seconds
TestRunner_l2cap-tester       PASS      27.79 seconds
TestRunner_iso-tester         PASS      57.80 seconds
TestRunner_bnep-tester        PASS      12.98 seconds
TestRunner_mgmt-tester        PASS      249.00 seconds
TestRunner_rfcomm-tester      PASS      19.17 seconds
TestRunner_sco-tester         PASS      22.09 seconds
TestRunner_ioctl-tester       PASS      21.92 seconds
TestRunner_mesh-tester        PASS      16.05 seconds
TestRunner_smp-tester         PASS      17.13 seconds
TestRunner_userchan-tester    PASS      14.02 seconds
IncrementalBuild              PASS      34.47 seconds



---
Regards,
Linux Bluetooth

[e-mail] Aug. 16, 2023, 7:20 p.m. UTC | #2

Hello:

This patch was applied to bluetooth/bluetooth-next.git (master)
by Luiz Augusto von Dentz <[e-mail]>:

On Tue, 15 Aug 2023 15:18:03 -0700 you wrote:
> From: Luiz Augusto von Dentz <[e-mail]>
> 
> This fixes sending BT_HCI_CMD_LE_CREATE_CONN_CANCEL when
> hci_le_create_conn_sync has not been called because HCI_CONN_SCANNING
> has been clear too early before its cmd_sync callback has been run.
> 
> Signed-off-by: Luiz Augusto von Dentz <[e-mail]>
> 
> [...]

Here is the summary with links:
  - Bluetooth: hci_conn: Fix sending BT_HCI_CMD_LE_CREATE_CONN_CANCEL
    https://git.kernel.org/bluetooth/bluetooth-next/c/5109ebb80dad

You are awesome, thank you!

Patch

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 234746721047..95339623883c 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -1299,6 +1299,7 @@  static int hci_connect_le_sync(struct hci_dev *hdev, void *data)
 
 	bt_dev_dbg(hdev, "conn %p", conn);
 
+	clear_bit(HCI_CONN_SCANNING, &conn->flags);
 	conn->state = BT_CONNECT;
 
 	return hci_le_create_conn_sync(hdev, conn);
@@ -1370,8 +1371,6 @@  struct hci_conn *hci_connect_le(struct hci_dev *hdev, bdaddr_t *dst,
 	conn->sec_level = BT_SECURITY_LOW;
 	conn->conn_timeout = conn_timeout;
 
-	clear_bit(HCI_CONN_SCANNING, &conn->flags);
-
 	err = hci_cmd_sync_queue(hdev, hci_connect_le_sync,
 				 UINT_PTR(conn->handle),
 				 create_le_conn_complete);