Skip to content

Commit

Permalink
Bluetooth: hci_sync: Convert adv_expire
Browse files Browse the repository at this point in the history
mgmt-test paths:
Set Advertising on - Appearance 1
Set Advertising on - Local name 1
Set Advertising on - Name + Appear 1
Set Local Name - Success 2
Set Local Name - Success 3
Add Advertising - Success (Empty ScRsp)
Add Advertising - Success (ScRsp appear)
Add Advertising - Invalid Params (ScRsp appear long)
Add Advertising - Success (Complete name)
Add Advertising - Success (Shortened name)
Add Advertising - Success (Short name)
Add Advertising - Success (Name + data)
Add Advertising - Invalid Params (Name + data)
Add Advertising - Success (Name+data+appear)
Set appearance - BR/EDR LE
Set appearance - LE only
Add Ext Advertising - Success (Empty ScRsp)
Add Ext Advertising - Success (ScRsp appear)
Add Ext Advertising - Invalid Params (ScRsp appear long)
Add Ext Advertising - Success (Complete name)
Add Ext Advertising - Success (Shortened name)
Add Ext Advertising - Success (Short name)
Add Ext Advertising - Success (Name + data)
Add Ext Advertising - Invalid Params (Name + data)
Add Ext Advertising - Success (Name+data+appear)

Signed-off-by: Brian Gix <brian.gix@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
  • Loading branch information
Brian Gix authored and Marcel Holtmann committed Oct 29, 2021
1 parent 26ac4c5 commit 5e233ed
Showing 1 changed file with 19 additions and 14 deletions.
33 changes: 19 additions & 14 deletions net/bluetooth/mgmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -3217,33 +3217,32 @@ static int user_passkey_neg_reply(struct sock *sk, struct hci_dev *hdev,
HCI_OP_USER_PASSKEY_NEG_REPLY, 0);
}

static void adv_expire(struct hci_dev *hdev, u32 flags)
static int adv_expire_sync(struct hci_dev *hdev, u32 flags)
{
struct adv_info *adv_instance;
struct hci_request req;
int err;

adv_instance = hci_find_adv_instance(hdev, hdev->cur_adv_instance);
if (!adv_instance)
return;
return 0;

/* stop if current instance doesn't need to be changed */
if (!(adv_instance->flags & flags))
return;
return 0;

cancel_adv_timeout(hdev);

adv_instance = hci_get_next_instance(hdev, adv_instance->instance);
if (!adv_instance)
return;
return 0;

hci_req_init(&req, hdev);
err = __hci_req_schedule_adv_instance(&req, adv_instance->instance,
true);
if (err)
return;
hci_schedule_adv_instance_sync(hdev, adv_instance->instance, true);

hci_req_run(&req, NULL);
return 0;
}

static int name_changed_sync(struct hci_dev *hdev, void *data)
{
return adv_expire_sync(hdev, MGMT_ADV_FLAG_LOCAL_NAME);
}

static void set_name_complete(struct hci_dev *hdev, void *data, int err)
Expand All @@ -3262,7 +3261,7 @@ static void set_name_complete(struct hci_dev *hdev, void *data, int err)
cp, sizeof(*cp));

if (hci_dev_test_flag(hdev, HCI_LE_ADV))
adv_expire(hdev, MGMT_ADV_FLAG_LOCAL_NAME);
hci_cmd_sync_queue(hdev, name_changed_sync, NULL, NULL);
}

mgmt_pending_remove(cmd);
Expand Down Expand Up @@ -3347,6 +3346,11 @@ static int set_local_name(struct sock *sk, struct hci_dev *hdev, void *data,
return err;
}

static int appearance_changed_sync(struct hci_dev *hdev, void *data)
{
return adv_expire_sync(hdev, MGMT_ADV_FLAG_APPEARANCE);
}

static int set_appearance(struct sock *sk, struct hci_dev *hdev, void *data,
u16 len)
{
Expand All @@ -3368,7 +3372,8 @@ static int set_appearance(struct sock *sk, struct hci_dev *hdev, void *data,
hdev->appearance = appearance;

if (hci_dev_test_flag(hdev, HCI_LE_ADV))
adv_expire(hdev, MGMT_ADV_FLAG_APPEARANCE);
hci_cmd_sync_queue(hdev, appearance_changed_sync, NULL,
NULL);

ext_info_changed(hdev, sk);
}
Expand Down

0 comments on commit 5e233ed

Please sign in to comment.