diff options
| author | David Herrmann <dh.herrmann@gmail.com> | 2013-04-06 20:28:47 +0200 |
|---|---|---|
| committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2013-04-17 03:03:55 -0300 |
| commit | 5205185d461d5902325e457ca80bd421127b7308 (patch) | |
| tree | 9344c3d0c1f3647852e2db772583dfc5e467c484 /net/bluetooth/hidp/hidp.h | |
| parent | b4f34d8d9d26b2428fa7cf7c8f97690a297978e6 (diff) | |
| download | linux-5205185d461d5902325e457ca80bd421127b7308.tar.bz2 | |
Bluetooth: hidp: remove old session-management
We have the full new session-management now available so lets switch over
and remove all the old code. Few semantics changed, so we need to adjust
the sock.c callers a bit. But this mostly simplifies the logic.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth/hidp/hidp.h')
| -rw-r--r-- | net/bluetooth/hidp/hidp.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/bluetooth/hidp/hidp.h b/net/bluetooth/hidp/hidp.h index c4fb980c2434..6162ce8606ac 100644 --- a/net/bluetooth/hidp/hidp.h +++ b/net/bluetooth/hidp/hidp.h @@ -123,8 +123,6 @@ struct hidp_connlist_req { int hidp_connection_add(struct hidp_connadd_req *req, struct socket *ctrl_sock, struct socket *intr_sock); int hidp_connection_del(struct hidp_conndel_req *req); -int hidp_add_connection(struct hidp_connadd_req *req, struct socket *ctrl_sock, struct socket *intr_sock); -int hidp_del_connection(struct hidp_conndel_req *req); int hidp_get_connlist(struct hidp_connlist_req *req); int hidp_get_conninfo(struct hidp_conninfo *ci); @@ -147,7 +145,6 @@ struct hidp_session { /* connection management */ bdaddr_t bdaddr; - struct hci_conn *hconn; struct l2cap_conn *conn; struct l2cap_user user; struct socket *ctrl_sock; @@ -180,9 +177,6 @@ struct hidp_session { /* Used in hidp_output_raw_report() */ int output_report_success; /* boolean */ - - wait_queue_head_t startup_queue; - int waiting_for_startup; }; /* HIDP init defines */ |