Bluetooth: hidp: remove unused session->state field

This field is always BT_CONNECTED. Remove it and set it to BT_CONNECTED in
hidp_copy_session() unconditionally.

Also note that this field is totally bogus. Userspace can query an
hidp-session for its state. However, whenever user-space queries us, this
field should be BT_CONNECTED. If it wasn't BT_CONNECTED, then we would be
currently cleaning up the session and the session itself would exit in the
next few milliseconds. Hence, there is no reason to let user-space know
that the session will exit now if they cannot make _any_ use of that.

Thus, remove the field and let user-space think that a session is always
BT_CONNECTED as long as they can query it.

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>

diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index 9734136d64311f7632115b509a1c28d1ae0e443c..22e9ab1403a070b46fb0f4235239519fef6eb5a3 100644 (file)
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -79,7 +79,7 @@ static void __hidp_copy_session(struct hidp_session *session, struct hidp_connin
        bacpy(&ci->bdaddr, &session->bdaddr);
 
        ci->flags = session->flags;
-       ci->state = session->state;
+       ci->state = BT_CONNECTED;
 
        ci->vendor  = 0x0000;
        ci->product = 0x0000;
@@ -970,7 +970,7 @@ int hidp_add_connection(struct hidp_connadd_req *req, struct socket *ctrl_sock,
        down_write(&hidp_session_sem);
 
        s = __hidp_get_session(&bt_sk(ctrl_sock->sk)->dst);
-       if (s && s->state == BT_CONNECTED) {
+       if (s) {
                up_write(&hidp_session_sem);
                return -EEXIST;
        }
@@ -992,7 +992,6 @@ int hidp_add_connection(struct hidp_connadd_req *req, struct socket *ctrl_sock,
 
        session->ctrl_sock = ctrl_sock;
        session->intr_sock = intr_sock;
-       session->state     = BT_CONNECTED;
 
        session->conn = hidp_get_connection(session);
        if (!session->conn) {

diff --git a/net/bluetooth/hidp/hidp.h b/net/bluetooth/hidp/hidp.h
index af1bcc823f26d8196587be3624b8f091f29f1d8f..57a6191674fdeee7c5f887223592ddfedc1c06d5 100644 (file)
--- a/net/bluetooth/hidp/hidp.h
+++ b/net/bluetooth/hidp/hidp.h
@@ -135,7 +135,6 @@ struct hidp_session {
 
        bdaddr_t bdaddr;
 
-       unsigned long state;
        unsigned long flags;
        unsigned long idle_to;