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

Bluetooth: Rename hci_find_ltk_by_addr to hci_find_ltk 



Now that hci_find_ltk_by_addr is the only LTK lookup function there's no
need to keep the long name anymore. This patch shortens the function
name to simply hci_find_ltk.

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

include/net/bluetooth/hci_core.h

+2 −2
Original line number Diff line number Diff line
@@ -924,7 +924,7 @@ struct link_key *hci_add_link_key(struct hci_dev *hdev, struct hci_conn *conn, 
struct smp_ltk *hci_add_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr,

			    u8 addr_type, u8 type, u8 authenticated,

			    u8 tk[16], u8 enc_size, __le16 ediv, __le64 rand);

struct smp_ltk *hci_find_ltk_by_addr(struct hci_dev *hdev, bdaddr_t *bdaddr,

struct smp_ltk *hci_find_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr,

			     u8 addr_type, u8 role);

int hci_remove_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 bdaddr_type);

void hci_smp_ltks_clear(struct hci_dev *hdev);

net/bluetooth/hci_core.c

+3 −3
Original line number Diff line number Diff line
@@ -3185,7 +3185,7 @@ static u8 ltk_role(u8 type) 
	return HCI_ROLE_SLAVE;

}



struct smp_ltk *hci_find_ltk_by_addr(struct hci_dev *hdev, bdaddr_t *bdaddr,

struct smp_ltk *hci_find_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr,

			     u8 addr_type, u8 role)

{

	struct smp_ltk *k;
@@ -3313,7 +3313,7 @@ struct smp_ltk *hci_add_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr, 
	struct smp_ltk *key, *old_key;

	u8 role = ltk_role(type);



	old_key = hci_find_ltk_by_addr(hdev, bdaddr, addr_type, role);

	old_key = hci_find_ltk(hdev, bdaddr, addr_type, role);

	if (old_key)

		key = old_key;

	else {

net/bluetooth/hci_event.c

+1 −2
Original line number Diff line number Diff line
@@ -4590,8 +4590,7 @@ static void hci_le_ltk_request_evt(struct hci_dev *hdev, struct sk_buff *skb) 
	if (conn == NULL)

		goto not_found;



	ltk = hci_find_ltk_by_addr(hdev, &conn->dst, conn->dst_type,

				   conn->role);

	ltk = hci_find_ltk(hdev, &conn->dst, conn->dst_type, conn->role);

	if (!ltk)

		goto not_found;

net/bluetooth/smp.c

+2 −4
Original line number Diff line number Diff line
@@ -1118,8 +1118,7 @@ static bool smp_ltk_encrypt(struct l2cap_conn *conn, u8 sec_level) 
	struct smp_ltk *key;

	struct hci_conn *hcon = conn->hcon;



	key = hci_find_ltk_by_addr(hcon->hdev, &hcon->dst, hcon->dst_type,

				   hcon->role);

	key = hci_find_ltk(hcon->hdev, &hcon->dst, hcon->dst_type, hcon->role);

	if (!key)

		return false;
@@ -1152,8 +1151,7 @@ bool smp_sufficient_security(struct hci_conn *hcon, u8 sec_level, 
	 */

	if (key_pref == SMP_USE_LTK &&

	    test_bit(HCI_CONN_STK_ENCRYPT, &hcon->flags) &&

	    hci_find_ltk_by_addr(hcon->hdev, &hcon->dst, hcon->dst_type,

				 hcon->role))

	    hci_find_ltk(hcon->hdev, &hcon->dst, hcon->dst_type, hcon->role))

		return false;



	if (hcon->sec_level >= sec_level)

CRA Git | Maintained and supported by SUSTech CRA and CCSE