Commit 501f8827 authored Jul 04, 2014 by Johan Hedberg Committed by Marcel Holtmann Jul 04, 2014

Bluetooth: Make hci_pend_le_conn_lookup more general purposed

In some circumstances we need to look up entries in pend_le_conns and in
other in pend_le_reports. This patch converts the existing lookup
function for pend_le_conns to something that can be used for both lists.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

parent d9b3ad7d

include/net/bluetooth/hci_core.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -868,8 +868,9 @@ void hci_conn_params_clear_all(struct hci_dev *hdev);
		void hci_conn_params_clear_disabled(struct hci_dev *hdev);
		void hci_conn_params_clear_enabled(struct hci_dev *hdev);

		struct hci_conn_params hci_pend_le_conn_lookup(struct hci_dev hdev,
		bdaddr_t *addr, u8 addr_type);
		struct hci_conn_params hci_pend_le_action_lookup(struct list_head list,
		bdaddr_t *addr,
		u8 addr_type);

		void hci_update_background_scan(struct hci_dev *hdev);

net/bluetooth/hci_core.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -3442,7 +3442,7 @@ static bool is_connected(struct hci_dev hdev, bdaddr_t addr, u8 type)
		}

		/* This function requires the caller holds hdev->lock */
		struct hci_conn_params hci_pend_le_conn_lookup(struct hci_dev hdev,
		struct hci_conn_params hci_pend_le_action_lookup(struct list_head list,
		bdaddr_t *addr, u8 addr_type)
		{
		struct hci_conn_params *param;
		@@ -3451,7 +3451,7 @@ struct hci_conn_params hci_pend_le_conn_lookup(struct hci_dev hdev,
		if (!hci_is_identity_address(addr, addr_type))
		return NULL;

		list_for_each_entry(param, &hdev->pend_le_conns, action) {
		list_for_each_entry(param, list, action) {
		if (bacmp(&param->addr, addr) == 0 &&
		param->addr_type == addr_type)
		return param;

net/bluetooth/hci_event.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -4194,7 +4194,7 @@ static bool check_pending_le_conn(struct hci_dev hdev, bdaddr_t addr,
		{
		struct hci_conn *conn;

		if (!hci_pend_le_conn_lookup(hdev, addr, addr_type))
		if (!hci_pend_le_action_lookup(&hdev->pend_le_conns, addr, addr_type))
		return false;

		conn = hci_connect_le(hdev, addr, addr_type, BT_SECURITY_LOW,