aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_event.c
diff options
context:
space:
mode:
authorWaldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>2011-04-28 06:07:53 -0400
committerGustavo F. Padovan <padovan@profusion.mobi>2011-04-28 14:02:04 -0400
commitb6020ba055c7f1ca901dc8751ecc7c9de58164db (patch)
tree340b7ce9c901125eaf7303b15c7ca17232fc001b /net/bluetooth/hci_event.c
parent314b2381a79c6bfe3ddc4ba3806ecb6aec27a3db (diff)
Bluetooth: Add definitions for link key types
Introduce the link key types defs and use them instead of magic numbers. Signed-off-by: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth/hci_event.c')
-rw-r--r--net/bluetooth/hci_event.c7
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 }