Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15819a70 authored by Andre Guedes's avatar Andre Guedes Committed by Johan Hedberg
Browse files

Bluetooth: Introduce connection parameters list 



This patch adds to hdev the connection parameters list (hdev->le_
conn_params). The elements from this list (struct hci_conn_params)
contains the connection parameters (for now, minimum and maximum
connection interval) that should be used during the connection
establishment.

Moreover, this patch adds helper functions to manipulate hdev->le_
conn_params list. Some of these functions are also declared in
hci_core.h since they will be used outside hci_core.c in upcoming
patches.

Signed-off-by: default avatarAndre Guedes <andre.guedes@openbossa.org>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 424ef943

include/net/bluetooth/hci_core.h

+18 −0
Original line number Diff line number Diff line
@@ -269,6 +269,7 @@ struct hci_dev { 
	struct list_head	link_keys;

	struct list_head	long_term_keys;

	struct list_head	remote_oob_data;

	struct list_head	le_conn_params;



	struct hci_dev_stats	stat;
@@ -373,6 +374,16 @@ struct hci_chan { 
	__u8		state;

};



struct hci_conn_params {

	struct list_head list;



	bdaddr_t addr;

	u8 addr_type;



	u16 conn_min_interval;

	u16 conn_max_interval;

};



extern struct list_head hci_dev_list;

extern struct list_head hci_cb_list;

extern rwlock_t hci_dev_list_lock;
@@ -751,6 +762,13 @@ int hci_blacklist_clear(struct hci_dev *hdev); 
int hci_blacklist_add(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type);

int hci_blacklist_del(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type);



struct hci_conn_params *hci_conn_params_lookup(struct hci_dev *hdev,

					       bdaddr_t *addr, u8 addr_type);

void hci_conn_params_add(struct hci_dev *hdev, bdaddr_t *addr, u8 addr_type,

			 u16 conn_min_interval, u16 conn_max_interval);

void hci_conn_params_del(struct hci_dev *hdev, bdaddr_t *addr, u8 addr_type);

void hci_conn_params_clear(struct hci_dev *hdev);



int hci_uuids_clear(struct hci_dev *hdev);



int hci_link_keys_clear(struct hci_dev *hdev);

net/bluetooth/hci_core.c

+77 −0
Original line number Diff line number Diff line
@@ -2924,6 +2924,81 @@ int hci_blacklist_del(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type) 
	return mgmt_device_unblocked(hdev, bdaddr, type);

}



/* This function requires the caller holds hdev->lock */

struct hci_conn_params *hci_conn_params_lookup(struct hci_dev *hdev,

					       bdaddr_t *addr, u8 addr_type)

{

	struct hci_conn_params *params;



	list_for_each_entry(params, &hdev->le_conn_params, list) {

		if (bacmp(&params->addr, addr) == 0 &&

		    params->addr_type == addr_type) {

			return params;

		}

	}



	return NULL;

}



/* This function requires the caller holds hdev->lock */

void hci_conn_params_add(struct hci_dev *hdev, bdaddr_t *addr, u8 addr_type,

			 u16 conn_min_interval, u16 conn_max_interval)

{

	struct hci_conn_params *params;



	params = hci_conn_params_lookup(hdev, addr, addr_type);

	if (params) {

		params->conn_min_interval = conn_min_interval;

		params->conn_max_interval = conn_max_interval;

		return;

	}



	params = kzalloc(sizeof(*params), GFP_KERNEL);

	if (!params) {

		BT_ERR("Out of memory");

		return;

	}



	bacpy(&params->addr, addr);

	params->addr_type = addr_type;

	params->conn_min_interval = conn_min_interval;

	params->conn_max_interval = conn_max_interval;



	list_add(&params->list, &hdev->le_conn_params);



	BT_DBG("addr %pMR (type %u) conn_min_interval 0x%.4x "

	       "conn_max_interval 0x%.4x", addr, addr_type, conn_min_interval,

	       conn_max_interval);

}



/* This function requires the caller holds hdev->lock */

void hci_conn_params_del(struct hci_dev *hdev, bdaddr_t *addr, u8 addr_type)

{

	struct hci_conn_params *params;



	params = hci_conn_params_lookup(hdev, addr, addr_type);

	if (!params)

		return;



	list_del(&params->list);

	kfree(params);



	BT_DBG("addr %pMR (type %u)", addr, addr_type);

}



/* This function requires the caller holds hdev->lock */

void hci_conn_params_clear(struct hci_dev *hdev)

{

	struct hci_conn_params *params, *tmp;



	list_for_each_entry_safe(params, tmp, &hdev->le_conn_params, list) {

		list_del(&params->list);

		kfree(params);

	}



	BT_DBG("All LE connection parameters were removed");

}



static void inquiry_complete(struct hci_dev *hdev, u8 status)

{

	if (status) {
@@ -3034,6 +3109,7 @@ struct hci_dev *hci_alloc_dev(void) 
	INIT_LIST_HEAD(&hdev->link_keys);

	INIT_LIST_HEAD(&hdev->long_term_keys);

	INIT_LIST_HEAD(&hdev->remote_oob_data);

	INIT_LIST_HEAD(&hdev->le_conn_params);

	INIT_LIST_HEAD(&hdev->conn_hash.list);



	INIT_WORK(&hdev->rx_work, hci_rx_work);
@@ -3219,6 +3295,7 @@ void hci_unregister_dev(struct hci_dev *hdev) 
	hci_link_keys_clear(hdev);

	hci_smp_ltks_clear(hdev);

	hci_remote_oob_data_clear(hdev);

	hci_conn_params_clear(hdev);

	hci_dev_unlock(hdev);



	hci_dev_put(hdev);