diff options
| author | Johan Hedberg <johan.hedberg@nokia.com> | 2011-04-28 11:29:01 -0700 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-04-28 16:14:41 -0300 |
| commit | 655fe6ece7e71b37c17577ae485d11bf701c95f7 (patch) | |
| tree | aa57a1796d17c5448d58aec884824d42ecc34468 /net/bluetooth | |
| parent | 12adcf3a953c3aa4006d855aa638133bf018ceac (diff) | |
| download | linux-3.10-655fe6ece7e71b37c17577ae485d11bf701c95f7.tar.gz linux-3.10-655fe6ece7e71b37c17577ae485d11bf701c95f7.tar.bz2 linux-3.10-655fe6ece7e71b37c17577ae485d11bf701c95f7.zip | |
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>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/hci_core.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 2ac6036b70c..59ca4755b6b 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -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); |