hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bluetooth: Use hci_conn_params_add within hci_conn_params_set 

The hci_conn_params_add function provides the default allocation of
connection parameters. To avoid code duplication, use that code from
hci_conn_params_set to allocate or lookup parameter struct.

As a benefit the connection latency and supervision timeout parameters
are no longer reset to default when calling hci_conn_params_set.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Marcel Holtmann 2014-07-01 12:11:05 +02:00
parent 51d167c097
commit 8c87aae1fa
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
net/bluetooth/hci_core.c
View File

@ -3513,29 +3513,12 @@ int hci_conn_params_set(struct hci_dev *hdev, bdaddr_t *addr, u8 addr_type,
{ {
struct hci_conn_params *params; struct hci_conn_params *params;
if (!is_identity_address(addr, addr_type)) params = hci_conn_params_add(hdev, addr, addr_type);
return -EINVAL; if (!params)
return -EIO;
params = hci_conn_params_lookup(hdev, addr, addr_type);
if (params)
goto update;
params = kzalloc(sizeof(*params), GFP_KERNEL);
if (!params) {
BT_ERR("Out of memory");
return -ENOMEM;
}
bacpy(&params->addr, addr);
params->addr_type = addr_type;
list_add(&params->list, &hdev->le_conn_params);
update:
params->conn_min_interval = conn_min_interval; params->conn_min_interval = conn_min_interval;
params->conn_max_interval = conn_max_interval; params->conn_max_interval = conn_max_interval;
params->conn_latency = hdev->le_conn_latency;
params->supervision_timeout = hdev->le_supv_timeout;
params->auto_connect = auto_connect; params->auto_connect = auto_connect;
switch (auto_connect) { switch (auto_connect) {