Commit 5d667ef6 authored Jun 12, 2015 by Johan Hedberg Committed by Marcel Holtmann Jun 12, 2015

Bluetooth: Remove redundant check for ACL_LINK



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>

parent 70f36507

net/bluetooth/hci_event.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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;