Просмотр исходного кода

Bluetooth: Remove unnecessary LTK type check from hci_add_ltk

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>
Johan Hedberg 11 лет назад
Родитель
Сommit
a513e260ce
1 измененных файлов с 0 добавлено и 3 удалено
  1. 0 3
      net/bluetooth/hci_core.c

+ 0 - 3
net/bluetooth/hci_core.c

@@ -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;
 	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);
 	old_key = hci_find_ltk_by_addr(hdev, bdaddr, addr_type);
 	if (old_key)
 	if (old_key)
 		key = old_key;
 		key = old_key;