aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/bluetooth/mgmt.h
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2012-01-17 14:48:47 -0500
committerJohan Hedberg <johan.hedberg@intel.com>2012-02-13 10:01:28 -0500
commitb644ba33699711630099efc58a4efc225560aceb (patch)
tree405fdec148d9d10186acf0e0d121b987eb208f19 /include/net/bluetooth/mgmt.h
parenta0c808b373e89aecc3ecae4cbdcdeff68aa12e3e (diff)
Bluetooth: Update device_connected and device_found events to latest API
This patch updates mgmt_ev_device_connected and mgmt_ev_device found to include an EIR-encoded remote name and class whenever possible. With this addition the mgmt_ev_remote_name event becomes unnecessary and can be removed. Since the connected event doesn't map to hci_conn_complete anymore a HCI_CONN_MGMT_CONNECTED flag is added to track when mgmt has been notified about a connection. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Acked-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'include/net/bluetooth/mgmt.h')
-rw-r--r--include/net/bluetooth/mgmt.h17
1 files changed, 8 insertions, 9 deletions
diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index bdace523b910..6f37983c8775 100644
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -329,6 +329,11 @@ struct mgmt_ev_new_link_key {
329} __packed; 329} __packed;
330 330
331#define MGMT_EV_DEVICE_CONNECTED 0x000A 331#define MGMT_EV_DEVICE_CONNECTED 0x000A
332struct mgmt_ev_device_connected {
333 struct mgmt_addr_info addr;
334 __le16 eir_len;
335 __u8 eir[0];
336} __packed;
332 337
333#define MGMT_EV_DEVICE_DISCONNECTED 0x000B 338#define MGMT_EV_DEVICE_DISCONNECTED 0x000B
334 339
@@ -371,20 +376,14 @@ struct mgmt_ev_device_found {
371 __u8 eir[0]; 376 __u8 eir[0];
372} __packed; 377} __packed;
373 378
374#define MGMT_EV_REMOTE_NAME 0x0012 379#define MGMT_EV_DISCOVERING 0x0012
375struct mgmt_ev_remote_name {
376 bdaddr_t bdaddr;
377 __u8 name[MGMT_MAX_NAME_LENGTH];
378} __packed;
379
380#define MGMT_EV_DISCOVERING 0x0013
381 380
382#define MGMT_EV_DEVICE_BLOCKED 0x0014 381#define MGMT_EV_DEVICE_BLOCKED 0x0013
383struct mgmt_ev_device_blocked { 382struct mgmt_ev_device_blocked {
384 bdaddr_t bdaddr; 383 bdaddr_t bdaddr;
385} __packed; 384} __packed;
386 385
387#define MGMT_EV_DEVICE_UNBLOCKED 0x0015 386#define MGMT_EV_DEVICE_UNBLOCKED 0x0014
388struct mgmt_ev_device_unblocked { 387struct mgmt_ev_device_unblocked {
389 bdaddr_t bdaddr; 388 bdaddr_t bdaddr;
390} __packed; 389} __packed;