]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Bluetooth: Remove redundant check for ACL_LINK
authorJohan Hedberg <johan.hedberg@intel.com>
Fri, 12 Jun 2015 10:04:47 +0000 (13:04 +0300)
committerMarcel Holtmann <marcel@holtmann.org>
Fri, 12 Jun 2015 10:07:20 +0000 (12:07 +0200)
The encryption key size is read only for BR/EDR (ACL_LINK) connections
so there's no need to check for it in the read_enc_key_size_complete()
callback.

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

index 88c57b12a222174c08cca83c1283b7d6ef81c587..32363c2b7f83d7b458eb303e2fbe7a8b050539b5 100644 (file)
@@ -2648,8 +2648,7 @@ static void read_enc_key_size_complete(struct hci_dev *hdev, u8 status,
 
                if (!test_bit(HCI_CONN_ENCRYPT, &conn->flags))
                        encrypt = 0x00;
-               else if (conn->type == ACL_LINK &&
-                        test_bit(HCI_CONN_AES_CCM, &conn->flags))
+               else if (test_bit(HCI_CONN_AES_CCM, &conn->flags))
                        encrypt = 0x02;
                else
                        encrypt = 0x01;