Commit 655fe6ec authored Apr 28, 2011 by Johan Hedberg Committed by Gustavo Padovan Apr 28, 2011

Bluetooth: Fix connection key type updating for buggy controllers



If a controller generates a changed combination key as its first key the
connection key type will not be correctly set. In these situations make
sure the update the connection key type when such a buggy controller is
detected.

Signed-off-by: Johan Hedberg <johan.hedberg@nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

parent 12adcf3a

net/bluetooth/hci_core.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -1083,8 +1083,11 @@ int hci_add_link_key(struct hci_dev hdev, struct hci_conn conn, int new_key,
		* previous key */
		if (type == HCI_LK_CHANGED_COMBINATION &&
		(!conn \|\| conn->remote_auth == 0xff) &&
		old_key_type == 0xff)
		old_key_type == 0xff) {
		type = HCI_LK_COMBINATION;
		if (conn)
		conn->key_type = type;
		}

		if (new_key && !hci_persistent_key(hdev, conn, type, old_key_type)) {
		list_del(&key->list);