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

Commit 17bc08f0 authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Remove unnecessary hci_explicit_connect_lookup function 



There's only one user of this helper which can be replaces with a call
to hci_pend_le_action_lookup() and a check for params->explicit_connect.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 1ede9868

include/net/bluetooth/hci_core.h

+0 −3
Original line number Diff line number Diff line
@@ -1042,9 +1042,6 @@ void hci_conn_params_clear_disabled(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 *hci_explicit_connect_lookup(struct hci_dev *hdev,

						    bdaddr_t *addr,

						    u8 addr_type);



void hci_uuids_clear(struct hci_dev *hdev);

net/bluetooth/hci_conn.c

+3 −2
Original line number Diff line number Diff line
@@ -83,8 +83,9 @@ static void hci_connect_le_scan_cleanup(struct hci_conn *conn) 
		bdaddr_type = irk->addr_type;

	}



	params = hci_explicit_connect_lookup(hdev, bdaddr, bdaddr_type);

	if (!params)

	params = hci_pend_le_action_lookup(&hdev->pend_le_conns, bdaddr,

					   bdaddr_type);

	if (!params || !params->explicit_connect)

		return;



	/* The connection attempt was doing scan for new RPA, and is

net/bluetooth/hci_core.c

+0 −17
Original line number Diff line number Diff line
@@ -2940,23 +2940,6 @@ struct hci_conn_params *hci_pend_le_action_lookup(struct list_head *list, 
	return NULL;

}



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

struct hci_conn_params *hci_explicit_connect_lookup(struct hci_dev *hdev,

						    bdaddr_t *addr,

						    u8 addr_type)

{

	struct hci_conn_params *param;



	list_for_each_entry(param, &hdev->pend_le_conns, action) {

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

		    param->addr_type == addr_type &&

		    param->explicit_connect)

			return param;

	}



	return NULL;

}



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

struct hci_conn_params *hci_conn_params_add(struct hci_dev *hdev,

					    bdaddr_t *addr, u8 addr_type)