From ed664d9897b92cf117445dd141ffc6891d305f51 Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Tue, 10 Aug 2021 14:50:16 -0700 Subject: [PATCH] advertising: Fix failing to advertise with Includes=local-name When local-name is set MGMT_ADV_FLAG_LOCAL_NAME would be set which would be sent with MGMT_OP_ADD_EXT_ADV_PARAMS but latter one it would be overwrite in generate_scan_rsp. --- src/advertising.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/advertising.c b/src/advertising.c index 70e60601d..bd79454d5 100644 --- a/src/advertising.c +++ b/src/advertising.c @@ -774,21 +774,14 @@ static uint8_t *generate_adv_data(struct btd_adv_client *client, static uint8_t *generate_scan_rsp(struct btd_adv_client *client, uint32_t *flags, size_t *len) { - struct btd_adv_manager *manager = client->manager; - const char *name; - - if (!(*flags & MGMT_ADV_FLAG_LOCAL_NAME) && !client->name) { + if (!client->name) { *len = 0; return NULL; } *flags &= ~MGMT_ADV_FLAG_LOCAL_NAME; - name = client->name; - if (!name) - name = btd_adapter_get_name(manager->adapter); - - bt_ad_add_name(client->scan, name); + bt_ad_add_name(client->scan, client->name); return bt_ad_generate(client->scan, len); } -- 2.47.3