Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 034cbea0 authored by Andrei Emeltchenko's avatar Andrei Emeltchenko Committed by Gustavo Padovan
Browse files

Bluetooth: Use HCI_MGMT instead of HCI_LINK_KEYS flag 



Use HCI_MGMT flag instead of HCI_LINK_KEYS flag. There is a problem with
HCI_LINK_KEYS flag since it is set only when link keys are loaded. Otherwise
kernel assumes that old interface is used.

Signed-off-by: default avatarAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 12602d0c

net/bluetooth/hci_event.c

+2 −2
Original line number Diff line number Diff line
@@ -2611,7 +2611,7 @@ static void hci_link_key_request_evt(struct hci_dev *hdev, struct sk_buff *skb) 


	BT_DBG("%s", hdev->name);



	if (!test_bit(HCI_LINK_KEYS, &hdev->dev_flags))

	if (!test_bit(HCI_MGMT, &hdev->dev_flags))

		return;



	hci_dev_lock(hdev);
@@ -2687,7 +2687,7 @@ static void hci_link_key_notify_evt(struct hci_dev *hdev, struct sk_buff *skb) 
		hci_conn_drop(conn);

	}



	if (test_bit(HCI_LINK_KEYS, &hdev->dev_flags))

	if (test_bit(HCI_MGMT, &hdev->dev_flags))

		hci_add_link_key(hdev, conn, 1, &ev->bdaddr, ev->link_key,

				 ev->key_type, pin_len);