aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_event.c
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2014-06-24 06:15:50 -0400
committerMarcel Holtmann <marcel@holtmann.org>2014-07-03 11:42:45 -0400
commit0663b297f1953e5d84928722e44f71272f5ff058 (patch)
treeaee0803ea892e127f9e7cb8f3abb1e16867d2537 /net/bluetooth/hci_event.c
parent7652ff6aeaf0eeaec1f2e7e2f3ce0e588447dbd1 (diff)
Bluetooth: Rename HCI_DEBUG_KEYS to HCI_KEEP_DEBUG_KEYS
We're planning to add a flag to actively use debug keys in addition to simply just accepting them, which makes the current generically named DEBUG_KEYS flag a bit confusing. Since the flag in practice affects whether the kernel keeps debug keys around or not rename it to HCI_KEEP_DEBUG_KEYS. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/hci_event.c')
-rw-r--r--net/bluetooth/hci_event.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 47bd48a597bd..b0fdeec2f2ca 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -3066,7 +3066,7 @@ static void hci_link_key_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
3066 BT_DBG("%s found key type %u for %pMR", hdev->name, key->type, 3066 BT_DBG("%s found key type %u for %pMR", hdev->name, key->type,
3067 &ev->bdaddr); 3067 &ev->bdaddr);
3068 3068
3069 if (!test_bit(HCI_DEBUG_KEYS, &hdev->dev_flags) && 3069 if (!test_bit(HCI_KEEP_DEBUG_KEYS, &hdev->dev_flags) &&
3070 key->type == HCI_LK_DEBUG_COMBINATION) { 3070 key->type == HCI_LK_DEBUG_COMBINATION) {
3071 BT_DBG("%s ignoring debug key", hdev->name); 3071 BT_DBG("%s ignoring debug key", hdev->name);
3072 goto not_found; 3072 goto not_found;