Bluetooth: Remove unnecessary LTK type check from hci_add_ltk
authorJohan Hedberg <johan.hedberg@intel.com>
Fri, 31 Jan 2014 03:39:59 +0000 (19:39 -0800)
committerJohan Hedberg <johan.hedberg@intel.com>
Thu, 13 Feb 2014 07:51:40 +0000 (09:51 +0200)
All callers of hci_add_ltk pass a valid value to it. There are no places
where e.g. user space, the controller or the remote peer would be able
to cause invalid values to be passed. Therefore, just remove the
potentially confusing check from the beginning of the function.

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

index 754a59079de91c69b9802043a7f443f772b48c8c..180473d965f64d4dd4c028ba43b3079039293050 100644 (file)
@@ -2692,9 +2692,6 @@ int hci_add_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 addr_type, u8 type,
 {
        struct smp_ltk *key, *old_key;
 
-       if (!(type & HCI_SMP_STK) && !(type & HCI_SMP_LTK))
-               return 0;
-
        old_key = hci_find_ltk_by_addr(hdev, bdaddr, addr_type);
        if (old_key)
                key = old_key;