aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2011-12-14 17:47:37 -0500
committerGustavo F. Padovan <padovan@profusion.mobi>2011-12-18 14:37:26 -0500
commit14c0b60829751135346d71e7d11649c4f72dc9af (patch)
tree1b1520fdb7a3175f3cba319a5678416da7a168f8 /include
parentf7c6869cebe631582fdc2ac57459ee217ce9b015 (diff)
Bluetooth: Remove mgmt_set_service_cache
Instead of having an explicit service cache command we can make the mgmt API simpler by implicitly enabling the cache when mgmt_read_info is called for the first time and disabling it when mgmt_set_dev_class is called. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'include')
-rw-r--r--include/net/bluetooth/hci_core.h4
-rw-r--r--include/net/bluetooth/mgmt.h5
2 files changed, 4 insertions, 5 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 72f84d6d4d3a..cc17f739dfff 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -943,12 +943,16 @@ int mgmt_device_unblocked(struct hci_dev *hdev, bdaddr_t *bdaddr);
943/* HCI info for socket */ 943/* HCI info for socket */
944#define hci_pi(sk) ((struct hci_pinfo *) sk) 944#define hci_pi(sk) ((struct hci_pinfo *) sk)
945 945
946/* HCI socket flags */
947#define HCI_PI_MGMT_INIT 0
948
946struct hci_pinfo { 949struct hci_pinfo {
947 struct bt_sock bt; 950 struct bt_sock bt;
948 struct hci_dev *hdev; 951 struct hci_dev *hdev;
949 struct hci_filter filter; 952 struct hci_filter filter;
950 __u32 cmsg_mask; 953 __u32 cmsg_mask;
951 unsigned short channel; 954 unsigned short channel;
955 unsigned long flags;
952}; 956};
953 957
954/* HCI security filter */ 958/* HCI security filter */
diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index bf217ccb86bf..bdb0a581149c 100644
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -121,11 +121,6 @@ struct mgmt_cp_set_dev_class {
121 __u8 minor; 121 __u8 minor;
122} __packed; 122} __packed;
123 123
124#define MGMT_OP_SET_SERVICE_CACHE 0x000C
125struct mgmt_cp_set_service_cache {
126 __u8 enable;
127} __packed;
128
129struct mgmt_link_key_info { 124struct mgmt_link_key_info {
130 bdaddr_t bdaddr; 125 bdaddr_t bdaddr;
131 u8 type; 126 u8 type;