Commit 51d167c0 authored by Marcel Holtmann's avatar Marcel Holtmann

Bluetooth: Change hci_conn_params_add to return the parameter struct

When adding new connection parameters, it is useful to return either
the existing struct or the newly created one.
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent f81cd823
...@@ -852,7 +852,8 @@ int hci_white_list_del(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type); ...@@ -852,7 +852,8 @@ int hci_white_list_del(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type);
struct hci_conn_params *hci_conn_params_lookup(struct hci_dev *hdev, struct hci_conn_params *hci_conn_params_lookup(struct hci_dev *hdev,
bdaddr_t *addr, u8 addr_type); bdaddr_t *addr, u8 addr_type);
int hci_conn_params_add(struct hci_dev *hdev, bdaddr_t *addr, u8 addr_type); struct hci_conn_params *hci_conn_params_add(struct hci_dev *hdev,
bdaddr_t *addr, u8 addr_type);
int hci_conn_params_set(struct hci_dev *hdev, bdaddr_t *addr, u8 addr_type, int hci_conn_params_set(struct hci_dev *hdev, bdaddr_t *addr, u8 addr_type,
u8 auto_connect, u16 conn_min_interval, u8 auto_connect, u16 conn_min_interval,
u16 conn_max_interval); u16 conn_max_interval);
......
...@@ -3472,21 +3472,22 @@ void hci_pend_le_conns_clear(struct hci_dev *hdev) ...@@ -3472,21 +3472,22 @@ void hci_pend_le_conns_clear(struct hci_dev *hdev)
} }
/* This function requires the caller holds hdev->lock */ /* This function requires the caller holds hdev->lock */
int hci_conn_params_add(struct hci_dev *hdev, bdaddr_t *addr, u8 addr_type) struct hci_conn_params *hci_conn_params_add(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)) if (!is_identity_address(addr, addr_type))
return -EINVAL; return NULL;
params = hci_conn_params_lookup(hdev, addr, addr_type); params = hci_conn_params_lookup(hdev, addr, addr_type);
if (params) if (params)
return 0; return params;
params = kzalloc(sizeof(*params), GFP_KERNEL); params = kzalloc(sizeof(*params), GFP_KERNEL);
if (!params) { if (!params) {
BT_ERR("Out of memory"); BT_ERR("Out of memory");
return -ENOMEM; return NULL;
} }
bacpy(&params->addr, addr); bacpy(&params->addr, addr);
...@@ -3502,7 +3503,7 @@ int hci_conn_params_add(struct hci_dev *hdev, bdaddr_t *addr, u8 addr_type) ...@@ -3502,7 +3503,7 @@ int hci_conn_params_add(struct hci_dev *hdev, bdaddr_t *addr, u8 addr_type)
BT_DBG("addr %pMR (type %u)", addr, addr_type); BT_DBG("addr %pMR (type %u)", addr, addr_type);
return 0; return params;
} }
/* This function requires the caller holds hdev->lock */ /* This function requires the caller holds hdev->lock */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment