| Message ID | 20240131162825.826774-1-luiz.dentz@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v1] Bluetooth: hci_event: Fix not indicating new connection for BIG Sync | expand |
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=821786 ---Test result--- Test Summary: CheckPatch PASS 0.80 seconds GitLint PASS 0.33 seconds SubjectPrefix PASS 0.13 seconds BuildKernel PASS 27.89 seconds CheckAllWarning PASS 30.81 seconds CheckSparse WARNING 35.76 seconds CheckSmatch WARNING 99.14 seconds BuildKernel32 PASS 27.12 seconds TestRunnerSetup PASS 433.23 seconds TestRunner_l2cap-tester PASS 22.89 seconds TestRunner_iso-tester PASS 42.58 seconds TestRunner_bnep-tester PASS 6.84 seconds TestRunner_mgmt-tester FAIL 227.13 seconds TestRunner_rfcomm-tester PASS 10.74 seconds TestRunner_sco-tester PASS 14.33 seconds TestRunner_ioctl-tester FAIL 17.16 seconds TestRunner_mesh-tester PASS 8.62 seconds TestRunner_smp-tester PASS 9.64 seconds TestRunner_userchan-tester PASS 7.22 seconds IncrementalBuild PASS 26.25 seconds Details ############################## Test: CheckSparse - WARNING Desc: Run sparse tool with linux kernel Output: net/bluetooth/hci_event.c: note: in included file (through include/net/bluetooth/hci_core.h): ############################## Test: CheckSmatch - WARNING Desc: Run smatch tool with source Output: net/bluetooth/hci_event.c: note: in included file (through include/net/bluetooth/hci_core.h): ############################## Test: TestRunner_mgmt-tester - FAIL Desc: Run mgmt-tester with test-runner Output: Total: 497, Passed: 485 (97.6%), Failed: 11, Not Run: 1 Failed Test Cases Get Clock Info - Success Timed out 2.354 seconds Get Conn Info - Success Timed out 1.838 seconds Get Conn Info - Power off Timed out 1.822 seconds Adv. connectable & connected (peripheral) - Success Timed out 10.770 seconds Adv. non-connectable & connected (peripheral) - Success Timed out 9.992 seconds Adv. connectable & connected (central) - Success Timed out 9.996 seconds Adv. non-connectable & connected (central) - Success Timed out 9.993 seconds Ext Adv. connectable & connected (peripheral) Timed out 10.618 seconds Ext Adv. non-connectable & connected (peripheral) Timed out 10.000 seconds Ext Adv. connectable & connected (central) Timed out 9.994 seconds Ext Adv. non-connectable & connected (central) Timed out 10.003 seconds ############################## Test: TestRunner_ioctl-tester - FAIL Desc: Run ioctl-tester with test-runner Output: Total: 28, Passed: 25 (89.3%), Failed: 3, Not Run: 0 Failed Test Cases Connection List Timed out 1.905 seconds Connection Info Timed out 1.991 seconds Authentication Info Timed out 2.512 seconds --- Regards, Linux Bluetooth
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 31df5f5b7994..acd8a778eecc 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -2526,9 +2526,7 @@ static void hci_check_pending_name(struct hci_dev *hdev, struct hci_conn *conn, * Only those in BT_CONFIG or BT_CONNECTED states can be * considered connected. */ - if (conn && - (conn->state == BT_CONFIG || conn->state == BT_CONNECTED) && - !test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags)) + if (conn && (conn->state == BT_CONFIG || conn->state == BT_CONNECTED)) mgmt_device_connected(hdev, conn, name, name_len); if (discov->state == DISCOVERY_STOPPED) @@ -3760,8 +3758,9 @@ static void hci_remote_features_evt(struct hci_dev *hdev, void *data, bacpy(&cp.bdaddr, &conn->dst); cp.pscan_rep_mode = 0x02; hci_send_cmd(hdev, HCI_OP_REMOTE_NAME_REQ, sizeof(cp), &cp); - } else if (!test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags)) + } else { mgmt_device_connected(hdev, conn, NULL, 0); + } if (!hci_outgoing_auth_needed(hdev, conn)) { conn->state = BT_CONNECTED; @@ -3934,6 +3933,11 @@ static u8 hci_cc_le_setup_iso_path(struct hci_dev *hdev, void *data, * last. */ hci_connect_cfm(conn, rp->status); + + /* Notify device connected in case it is a BIG Sync */ + if (test_bit(HCI_CONN_BIG_SYNC, &conn->flags)) + mgmt_device_connected(hdev, conn, NULL, 0); + break; } @@ -5008,8 +5012,9 @@ static void hci_remote_ext_features_evt(struct hci_dev *hdev, void *data, bacpy(&cp.bdaddr, &conn->dst); cp.pscan_rep_mode = 0x02; hci_send_cmd(hdev, HCI_OP_REMOTE_NAME_REQ, sizeof(cp), &cp); - } else if (!test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags)) + } else { mgmt_device_connected(hdev, conn, NULL, 0); + } if (!hci_outgoing_auth_needed(hdev, conn)) { conn->state = BT_CONNECTED; @@ -5982,8 +5987,7 @@ static void le_conn_complete_evt(struct hci_dev *hdev, u8 status, goto unlock; } - if (!test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags)) - mgmt_device_connected(hdev, conn, NULL, 0); + mgmt_device_connected(hdev, conn, NULL, 0); conn->sec_level = BT_SECURITY_LOW; conn->state = BT_CONFIG; diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 8c4493255f92..bf5717094f46 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -9689,6 +9689,9 @@ void mgmt_device_connected(struct hci_dev *hdev, struct hci_conn *conn, u16 eir_len = 0; u32 flags = 0; + if (!test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags)) + return; + /* allocate buff for LE or BR/EDR adv */ if (conn->le_adv_data_len > 0) skb = mgmt_alloc_skb(hdev, MGMT_EV_DEVICE_CONNECTED,