Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-26 06:02:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bluetooth: hci_sync: Convert MGMT_OP_SET_LOCAL_NAME

Browse Source 
Uses existing *_sync functions, but made hci_update_name_sync
non-static.

mgmt-test paths:
Set Advertising on - Local name 1
Set Advertising on - Name + Appear 1
Set Local Name - Success 1
Set Local Name - Success 2
Set Local Name - Success 3
Add Advertising - Success (Empty ScRsp)
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)
Read Ext Controller Info 3
Read Ext Controller Info 4
Read Ext Controller Info 5
Add Ext Advertising - Success (Empty ScRsp)
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>
This commit is contained in:
Brian Gix 2021-10-27 16:58:54 -07:00 committed by Marcel Holtmann
parent 177e77a30e
commit 6f6ff38a1e
3 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/bluetooth/hci_sync.h
View File

@ -46,6 +46,7 @@ int hci_update_class_sync(struct hci_dev *hdev);
int hci_update_eir_sync(struct hci_dev *hdev);
int hci_update_class_sync(struct hci_dev *hdev);
int hci_update_name_sync(struct hci_dev *hdev);
int hci_update_random_address_sync(struct hci_dev *hdev, bool require_privacy,
bool rpa, u8 *own_addr_type);

2
net/bluetooth/hci_sync.c
View File

@ -2341,7 +2341,7 @@ int hci_update_scan_sync(struct hci_dev *hdev)
return hci_write_scan_enable_sync(hdev, scan);
}
static int hci_update_name_sync(struct hci_dev *hdev)
int hci_update_name_sync(struct hci_dev *hdev)
{
struct hci_cp_write_local_name cp;

67
net/bluetooth/mgmt.c
View File

@ -3246,24 +3246,17 @@ static void adv_expire(struct hci_dev *hdev, u32 flags)
hci_req_run(&req, NULL);
}
static void set_name_complete(struct hci_dev *hdev, u8 status, u16 opcode)
static void set_name_complete(struct hci_dev *hdev, void *data, int err)
{
struct mgmt_cp_set_local_name *cp;
struct mgmt_pending_cmd *cmd;
struct mgmt_pending_cmd *cmd = data;
struct mgmt_cp_set_local_name *cp = cmd->param;
u8 status = mgmt_status(err);
bt_dev_dbg(hdev, "status 0x%02x", status);
hci_dev_lock(hdev);
cmd = pending_find(MGMT_OP_SET_LOCAL_NAME, hdev);
if (!cmd)
goto unlock;
cp = cmd->param;
bt_dev_dbg(hdev, "err %d", err);
if (status) {
mgmt_cmd_status(cmd->sk, hdev->id, MGMT_OP_SET_LOCAL_NAME,
mgmt_status(status));
status);
} else {
mgmt_cmd_complete(cmd->sk, hdev->id, MGMT_OP_SET_LOCAL_NAME, 0,
cp, sizeof(*cp));
@ -3273,9 +3266,22 @@ static void set_name_complete(struct hci_dev *hdev, u8 status, u16 opcode)
}
mgmt_pending_remove(cmd);
}
unlock:
hci_dev_unlock(hdev);
static int set_name_sync(struct hci_dev *hdev, void *data)
{
if (lmp_bredr_capable(hdev)) {
hci_update_name_sync(hdev);
hci_update_eir_sync(hdev);
}
/* The name is stored in the scan response data and so
* no need to update the advertising data here.
*/
if (lmp_le_capable(hdev) && hci_dev_test_flag(hdev, HCI_ADVERTISING))
hci_update_scan_rsp_data_sync(hdev, hdev->cur_adv_instance);
return 0;
}
static int set_local_name(struct sock *sk, struct hci_dev *hdev, void *data,
@ -3283,7 +3289,6 @@ static int set_local_name(struct sock *sk, struct hci_dev *hdev, void *data,
{
struct mgmt_cp_set_local_name *cp = data;
struct mgmt_pending_cmd *cmd;
struct hci_request req;
int err;
bt_dev_dbg(hdev, "sock %p", sk);
@ -3319,30 +3324,24 @@ static int set_local_name(struct sock *sk, struct hci_dev *hdev, void *data,
}
cmd = mgmt_pending_add(sk, MGMT_OP_SET_LOCAL_NAME, hdev, data, len);
if (!cmd) {
if (!cmd)
err = -ENOMEM;
else
err = hci_cmd_sync_queue(hdev, set_name_sync, cmd,
set_name_complete);
if (err < 0) {
err = mgmt_cmd_status(sk, hdev->id, MGMT_OP_SET_LOCAL_NAME,
MGMT_STATUS_FAILED);
if (cmd)
mgmt_pending_remove(cmd);
goto failed;
}
memcpy(hdev->dev_name, cp->name, sizeof(hdev->dev_name));
hci_req_init(&req, hdev);
if (lmp_bredr_capable(hdev)) {
__hci_req_update_name(&req);
__hci_req_update_eir(&req);
}
/* The name is stored in the scan response data and so
* no need to update the advertising data here.
*/
if (lmp_le_capable(hdev) && hci_dev_test_flag(hdev, HCI_ADVERTISING))
__hci_req_update_scan_rsp_data(&req, hdev->cur_adv_instance);
err = hci_req_run(&req, set_name_complete);
if (err < 0)
mgmt_pending_remove(cmd);
failed:
hci_dev_unlock(hdev);
return err;