| Message ID | 20250208-client_eatt-v1-1-17932786b2cf@amlogic.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [BlueZ,bluez] client: Set the feature when initializing the client | expand |
| Context | Check | Description |
|---|---|---|
| tedd_an/pre-ci_am | success | Success |
| tedd_an/BuildEll | success | Build ELL PASS |
| tedd_an/BluezMake | success | Bluez Make PASS |
| tedd_an/MakeCheck | success | Bluez Make Check PASS |
| tedd_an/MakeDistcheck | success | Make Distcheck PASS |
| tedd_an/CheckValgrind | success | Check Valgrind PASS |
| tedd_an/CheckSmatch | success | CheckSparse PASS |
| tedd_an/bluezmakeextell | success | Make External ELL PASS |
| tedd_an/ScanBuild | success | Scan Build PASS |
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=931887 ---Test result--- Test Summary: CheckPatch PENDING 0.25 seconds GitLint PENDING 0.19 seconds BuildEll PASS 20.13 seconds BluezMake PASS 1500.00 seconds MakeCheck PASS 13.10 seconds MakeDistcheck PASS 155.66 seconds CheckValgrind PASS 211.75 seconds CheckSmatch PASS 281.19 seconds bluezmakeextell PASS 97.08 seconds IncrementalBuild PENDING 0.27 seconds ScanBuild PASS 846.86 seconds Details ############################## Test: CheckPatch - PENDING Desc: Run checkpatch.pl script Output: ############################## Test: GitLint - PENDING Desc: Run gitlint Output: ############################## Test: IncrementalBuild - PENDING Desc: Incremental build with the patches in the series Output: --- Regards, Linux Bluetooth
diff --git a/src/device.c b/src/device.c index e8bff718c..dfa8b277e 100644 --- a/src/device.c +++ b/src/device.c @@ -5628,6 +5628,8 @@ static void gatt_debug(const char *str, void *user_data) static void gatt_client_init(struct btd_device *device) { + uint8_t features; + gatt_client_cleanup(device); if (!device->connect && !btd_opts.reverse_discovery) { @@ -5639,8 +5641,13 @@ static void gatt_client_init(struct btd_device *device) return; } + features = BT_GATT_CHRC_CLI_FEAT_ROBUST_CACHING + | BT_GATT_CHRC_CLI_FEAT_NFY_MULTI; + if (btd_opts.gatt_channels > 1) + features |= BT_GATT_CHRC_CLI_FEAT_EATT; + device->client = bt_gatt_client_new(device->db, device->att, - device->att_mtu, 0); + device->att_mtu, features); if (!device->client) { DBG("Failed to initialize"); return; diff --git a/src/gatt-database.c b/src/gatt-database.c index a5a01add4..1056b9797 100644 --- a/src/gatt-database.c +++ b/src/gatt-database.c @@ -1245,7 +1245,8 @@ static void server_feat_read_cb(struct gatt_db_attribute *attrib, goto done; } - value |= BT_GATT_CHRC_SERVER_FEAT_EATT; + if (btd_opts.gatt_channels > 1) + value |= BT_GATT_CHRC_SERVER_FEAT_EATT; done: gatt_db_attribute_read_result(attrib, id, ecode, &value, sizeof(value)); diff --git a/src/shared/gatt-client.c b/src/shared/gatt-client.c index 9db3f5211..41a5c6f9c 100644 --- a/src/shared/gatt-client.c +++ b/src/shared/gatt-client.c @@ -2043,7 +2043,7 @@ static void write_client_features(struct bt_gatt_client *client) handle = gatt_db_attribute_get_handle(attr); - client->features = BT_GATT_CHRC_CLI_FEAT_ROBUST_CACHING; + client->features |= BT_GATT_CHRC_CLI_FEAT_ROBUST_CACHING; bt_uuid16_create(&uuid, GATT_CHARAC_SERVER_FEAT); @@ -2055,10 +2055,12 @@ static void write_client_features(struct bt_gatt_client *client) gatt_db_attribute_read(attr, 0, BT_ATT_OP_READ_REQ, NULL, server_feat_read_value, &feat); - if (feat && feat[0] & BT_GATT_CHRC_SERVER_FEAT_EATT) - client->features |= BT_GATT_CHRC_CLI_FEAT_EATT; + if (!(feat && feat[0] & BT_GATT_CHRC_SERVER_FEAT_EATT) + || !(client->features & BT_GATT_CHRC_CLI_FEAT_EATT)) + client->features &= ~BT_GATT_CHRC_CLI_FEAT_EATT; } + client->features |= BT_GATT_CHRC_CLI_FEAT_NFY_MULTI; DBG(client, "Writing Client Features 0x%02x", client->features);