luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bluetooth: Rename hci_find_ltk_by_addr to hci_find_ltk

Browse Source 
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: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Johan Hedberg 2014-05-29 15:02:59 +03:00 committed by Marcel Holtmann
parent 0ac3dbf999
commit f3a73d97b3
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/bluetooth/hci_core.h
View File

@ -924,8 +924,8 @@ 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, struct smp_ltk *hci_add_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr,
u8 addr_type, u8 type, u8 authenticated, u8 addr_type, u8 type, u8 authenticated,
u8 tk[16], u8 enc_size, __le16 ediv, __le64 rand); 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); u8 addr_type, u8 role);
int hci_remove_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 bdaddr_type); int hci_remove_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 bdaddr_type);
void hci_smp_ltks_clear(struct hci_dev *hdev); void hci_smp_ltks_clear(struct hci_dev *hdev);
int hci_remove_link_key(struct hci_dev *hdev, bdaddr_t *bdaddr); int hci_remove_link_key(struct hci_dev *hdev, bdaddr_t *bdaddr);

6
net/bluetooth/hci_core.c
View File

@ -3185,8 +3185,8 @@ static u8 ltk_role(u8 type)
return HCI_ROLE_SLAVE; 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) u8 addr_type, u8 role)
{ {
struct smp_ltk *k; 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; struct smp_ltk *key, *old_key;
u8 role = ltk_role(type); 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) if (old_key)
key = old_key; key = old_key;
else { else {

3
net/bluetooth/hci_event.c
View File

@ -4590,8 +4590,7 @@ static void hci_le_ltk_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
if (conn == NULL) if (conn == NULL)
goto not_found; goto not_found;
ltk = hci_find_ltk_by_addr(hdev, &conn->dst, conn->dst_type, ltk = hci_find_ltk(hdev, &conn->dst, conn->dst_type, conn->role);
conn->role);
if (!ltk) if (!ltk)
goto not_found; goto not_found;

6
net/bluetooth/smp.c
View File

@ -1118,8 +1118,7 @@ static bool smp_ltk_encrypt(struct l2cap_conn *conn, u8 sec_level)
struct smp_ltk *key; struct smp_ltk *key;
struct hci_conn *hcon = conn->hcon; struct hci_conn *hcon = conn->hcon;
key = hci_find_ltk_by_addr(hcon->hdev, &hcon->dst, hcon->dst_type, key = hci_find_ltk(hcon->hdev, &hcon->dst, hcon->dst_type, hcon->role);
hcon->role);
if (!key) if (!key)
return false; return false;
@ -1152,8 +1151,7 @@ bool smp_sufficient_security(struct hci_conn *hcon, u8 sec_level,
*/ */
if (key_pref == SMP_USE_LTK && if (key_pref == SMP_USE_LTK &&
test_bit(HCI_CONN_STK_ENCRYPT, &hcon->flags) && test_bit(HCI_CONN_STK_ENCRYPT, &hcon->flags) &&
hci_find_ltk_by_addr(hcon->hdev, &hcon->dst, hcon->dst_type, hci_find_ltk(hcon->hdev, &hcon->dst, hcon->dst_type, hcon->role))
hcon->role))
return false; return false;
if (hcon->sec_level >= sec_level) if (hcon->sec_level >= sec_level)