diff options
author | Johan Hedberg <johan.hedberg@intel.com> | 2014-05-29 08:02:59 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2014-12-03 10:51:16 -0500 |
commit | f3a73d97b3b78584e111478d07dfd063453f112e (patch) | |
tree | c00dcbd2a83abb6a8c722f2141c8cbddd59dfd59 /net/bluetooth/smp.c | |
parent | 0ac3dbf9995281261abecfd2970406dd4e07955b (diff) |
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: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/smp.c')
-rw-r--r-- | net/bluetooth/smp.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c index 4ecbf2774fbd..0973e37073e2 100644 --- a/net/bluetooth/smp.c +++ b/net/bluetooth/smp.c | |||
@@ -1118,8 +1118,7 @@ static bool smp_ltk_encrypt(struct l2cap_conn *conn, u8 sec_level) | |||
1118 | struct smp_ltk *key; | 1118 | struct smp_ltk *key; |
1119 | struct hci_conn *hcon = conn->hcon; | 1119 | struct hci_conn *hcon = conn->hcon; |
1120 | 1120 | ||
1121 | key = hci_find_ltk_by_addr(hcon->hdev, &hcon->dst, hcon->dst_type, | 1121 | key = hci_find_ltk(hcon->hdev, &hcon->dst, hcon->dst_type, hcon->role); |
1122 | hcon->role); | ||
1123 | if (!key) | 1122 | if (!key) |
1124 | return false; | 1123 | return false; |
1125 | 1124 | ||
@@ -1152,8 +1151,7 @@ bool smp_sufficient_security(struct hci_conn *hcon, u8 sec_level, | |||
1152 | */ | 1151 | */ |
1153 | if (key_pref == SMP_USE_LTK && | 1152 | if (key_pref == SMP_USE_LTK && |
1154 | test_bit(HCI_CONN_STK_ENCRYPT, &hcon->flags) && | 1153 | test_bit(HCI_CONN_STK_ENCRYPT, &hcon->flags) && |
1155 | hci_find_ltk_by_addr(hcon->hdev, &hcon->dst, hcon->dst_type, | 1154 | hci_find_ltk(hcon->hdev, &hcon->dst, hcon->dst_type, hcon->role)) |
1156 | hcon->role)) | ||
1157 | return false; | 1155 | return false; |
1158 | 1156 | ||
1159 | if (hcon->sec_level >= sec_level) | 1157 | if (hcon->sec_level >= sec_level) |