Bluetooth: Remove unused hci_find_ltk function

Now that LTKs are always looked up based on bdaddr (with EDiv/Rand
checks done after a successful lookup) the hci_find_ltk function is not
needed anymore. This patch removes the function.

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

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 7f08ea36d2466d99a90c49954dc5132ecccc93db..b41969b561d82062024b6181078f6685fa968018 100644 (file)
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -921,8 +921,6 @@ struct link_key *hci_find_link_key(struct hci_dev *hdev, bdaddr_t *bdaddr);
 struct link_key *hci_add_link_key(struct hci_dev *hdev, struct hci_conn *conn,
                                  bdaddr_t *bdaddr, u8 *val, u8 type,
                                  u8 pin_len, bool *persistent);
-struct smp_ltk *hci_find_ltk(struct hci_dev *hdev, __le16 ediv, __le64 rand,
-                            u8 role);
 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);

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index e091e8ffeb8eab69b99e08f9cb7f0c5085d16d14..cb9bc8e2c58d25dbbb0d4e451f1aa7c786dd2f83 100644 (file)
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -3185,34 +3185,6 @@ static u8 ltk_role(u8 type)
        return HCI_ROLE_SLAVE;
 }
 
-struct smp_ltk *hci_find_ltk(struct hci_dev *hdev, __le16 ediv, __le64 rand,
-                            u8 role)
-{
-       struct smp_ltk *k;
-
-       rcu_read_lock();
-       list_for_each_entry_rcu(k, &hdev->long_term_keys, list) {
-               if (k->ediv != ediv || k->rand != rand)
-                       continue;
-
-               if (smp_ltk_is_sc(k)) {
-                       if (k->type == SMP_LTK_P256_DEBUG &&
-                           !test_bit(HCI_KEEP_DEBUG_KEYS, &hdev->dev_flags))
-                               continue;
-                       rcu_read_unlock();
-                       return k;
-               }
-
-               if (ltk_role(k->type) == role) {
-                       rcu_read_unlock();
-                       return k;
-               }
-       }
-       rcu_read_unlock();
-
-       return NULL;
-}
-
 struct smp_ltk *hci_find_ltk_by_addr(struct hci_dev *hdev, bdaddr_t *bdaddr,
                                     u8 addr_type, u8 role)
 {