diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/bluetooth/hci_core.c | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 883ddd52344d..9ae945d8ad7e 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c | |||
@@ -3513,29 +3513,12 @@ int hci_conn_params_set(struct hci_dev *hdev, bdaddr_t *addr, u8 addr_type, | |||
3513 | { | 3513 | { |
3514 | struct hci_conn_params *params; | 3514 | struct hci_conn_params *params; |
3515 | 3515 | ||
3516 | if (!is_identity_address(addr, addr_type)) | 3516 | params = hci_conn_params_add(hdev, addr, addr_type); |
3517 | return -EINVAL; | 3517 | if (!params) |
3518 | 3518 | return -EIO; | |
3519 | params = hci_conn_params_lookup(hdev, addr, addr_type); | ||
3520 | if (params) | ||
3521 | goto update; | ||
3522 | |||
3523 | params = kzalloc(sizeof(*params), GFP_KERNEL); | ||
3524 | if (!params) { | ||
3525 | BT_ERR("Out of memory"); | ||
3526 | return -ENOMEM; | ||
3527 | } | ||
3528 | |||
3529 | bacpy(¶ms->addr, addr); | ||
3530 | params->addr_type = addr_type; | ||
3531 | |||
3532 | list_add(¶ms->list, &hdev->le_conn_params); | ||
3533 | 3519 | ||
3534 | update: | ||
3535 | params->conn_min_interval = conn_min_interval; | 3520 | params->conn_min_interval = conn_min_interval; |
3536 | params->conn_max_interval = conn_max_interval; | 3521 | params->conn_max_interval = conn_max_interval; |
3537 | params->conn_latency = hdev->le_conn_latency; | ||
3538 | params->supervision_timeout = hdev->le_supv_timeout; | ||
3539 | params->auto_connect = auto_connect; | 3522 | params->auto_connect = auto_connect; |
3540 | 3523 | ||
3541 | switch (auto_connect) { | 3524 | switch (auto_connect) { |