diff options
author | Andrei Emeltchenko <andrei.emeltchenko@intel.com> | 2013-05-14 04:44:17 -0400 |
---|---|---|
committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2013-06-22 19:23:53 -0400 |
commit | 0a804654af62dfea4899c66561d74d72273b2921 (patch) | |
tree | 2a2c8c377d452c2c5d843b1ade7030bc86d53411 | |
parent | 034cbea0931433cf88a1f79a385402604f08bd67 (diff) |
Bluetooth: Remove unneeded flag
Remove HCI_LINK_KEYS flag since using HCI_MGMT is enough for test that
user space expects the kernel managing link keys.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
-rw-r--r-- | include/net/bluetooth/hci.h | 1 | ||||
-rw-r--r-- | net/bluetooth/mgmt.c | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index e0512aaef4b8..3c592cf473da 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h | |||
@@ -107,7 +107,6 @@ enum { | |||
107 | HCI_MGMT, | 107 | HCI_MGMT, |
108 | HCI_PAIRABLE, | 108 | HCI_PAIRABLE, |
109 | HCI_SERVICE_CACHE, | 109 | HCI_SERVICE_CACHE, |
110 | HCI_LINK_KEYS, | ||
111 | HCI_DEBUG_KEYS, | 110 | HCI_DEBUG_KEYS, |
112 | HCI_UNREGISTER, | 111 | HCI_UNREGISTER, |
113 | 112 | ||
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 7ae737fcf5e7..fedc5399d465 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c | |||
@@ -1736,8 +1736,6 @@ static int load_link_keys(struct sock *sk, struct hci_dev *hdev, void *data, | |||
1736 | 1736 | ||
1737 | hci_link_keys_clear(hdev); | 1737 | hci_link_keys_clear(hdev); |
1738 | 1738 | ||
1739 | set_bit(HCI_LINK_KEYS, &hdev->dev_flags); | ||
1740 | |||
1741 | if (cp->debug_keys) | 1739 | if (cp->debug_keys) |
1742 | set_bit(HCI_DEBUG_KEYS, &hdev->dev_flags); | 1740 | set_bit(HCI_DEBUG_KEYS, &hdev->dev_flags); |
1743 | else | 1741 | else |