aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@nokia.com>2011-01-10 06:28:59 -0500
committerGustavo F. Padovan <padovan@profusion.mobi>2011-02-07 22:40:06 -0500
commita5040efa2017f3e4f1b4d5f40fd989567f3994c1 (patch)
tree451984186e4504665bff2ed0b74a9510a0d32d13 /include/net
parent03b555e119de8288a16e086e1fbd223d9b429d3d (diff)
Bluetooth: Add special handling with __hci_request and HCI_INIT
To support a more dynamic HCI initialization sequence the __hci_request behavior requires some more changes. Particularly, the init sequence should be able to have conditionals in it (sending some HCI commands depending on the outcome of a previous command) instead of being a fixed list as it is right now. The reasons for these additional requirements are the moving all previously user space driven initialization commands to the kernel side as well as the support the Low Energy controllers. To fulfull these requirements the init sequence is made the only special case for multi-command requests and req_last_cmd is renamed to init_last_cmd. The hci_send_cmd function is changed to update init_last_cmd as long as the HCI_INIT flag is set. Signed-off-by: Johan Hedberg <johan.hedberg@nokia.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/bluetooth/hci_core.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index dc8084a139ed..0dbdcc5f44e4 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -139,7 +139,8 @@ struct hci_dev {
139 wait_queue_head_t req_wait_q; 139 wait_queue_head_t req_wait_q;
140 __u32 req_status; 140 __u32 req_status;
141 __u32 req_result; 141 __u32 req_result;
142 __u16 req_last_cmd; 142
143 __u16 init_last_cmd;
143 144
144 struct inquiry_cache inq_cache; 145 struct inquiry_cache inq_cache;
145 struct hci_conn_hash conn_hash; 146 struct hci_conn_hash conn_hash;