diff options
Diffstat (limited to 'net/bluetooth/hci_event.c')
-rw-r--r-- | net/bluetooth/hci_event.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index e64a3de70d77..fbbb63f8a897 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c | |||
@@ -2053,15 +2053,16 @@ static inline void hci_link_key_request_evt(struct hci_dev *hdev, struct sk_buff | |||
2053 | BT_DBG("%s found key type %u for %s", hdev->name, key->type, | 2053 | BT_DBG("%s found key type %u for %s", hdev->name, key->type, |
2054 | batostr(&ev->bdaddr)); | 2054 | batostr(&ev->bdaddr)); |
2055 | 2055 | ||
2056 | if (!test_bit(HCI_DEBUG_KEYS, &hdev->flags) && key->type == 0x03) { | 2056 | if (!test_bit(HCI_DEBUG_KEYS, &hdev->flags) && |
2057 | key->type == HCI_LK_DEBUG_COMBINATION) { | ||
2057 | BT_DBG("%s ignoring debug key", hdev->name); | 2058 | BT_DBG("%s ignoring debug key", hdev->name); |
2058 | goto not_found; | 2059 | goto not_found; |
2059 | } | 2060 | } |
2060 | 2061 | ||
2061 | conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &ev->bdaddr); | 2062 | conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &ev->bdaddr); |
2062 | 2063 | ||
2063 | if (key->type == 0x04 && conn && conn->auth_type != 0xff && | 2064 | if (key->type == HCI_LK_UNAUTH_COMBINATION && conn && |
2064 | (conn->auth_type & 0x01)) { | 2065 | conn->auth_type != 0xff && (conn->auth_type & 0x01)) { |
2065 | BT_DBG("%s ignoring unauthenticated key", hdev->name); | 2066 | BT_DBG("%s ignoring unauthenticated key", hdev->name); |
2066 | goto not_found; | 2067 | goto not_found; |
2067 | } | 2068 | } |