Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24fd642c authored by Dean Jenkins's avatar Dean Jenkins Committed by Gustavo Padovan
Browse files

Bluetooth: Remove redundant RFCOMM BT_CLOSED settings 



rfcomm_session_close() sets the RFCOMM session state to BT_CLOSED.
However, in multiple places immediately before the function is
called, the RFCOMM session is set to BT_CLOSED. Therefore,
remove these unnecessary state settings.

Signed-off-by: default avatarDean Jenkins <Dean_Jenkins@mentor.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 8e888f27

net/bluetooth/rfcomm/core.c

+2 −5
Original line number Diff line number Diff line
@@ -659,10 +659,10 @@ static struct rfcomm_session *rfcomm_session_close(struct rfcomm_session *s, 
	struct rfcomm_dlc *d;

	struct list_head *p, *n;



	BT_DBG("session %p state %ld err %d", s, s->state, err);



	s->state = BT_CLOSED;



	BT_DBG("session %p state %ld err %d", s, s->state, err);



	/* Close all dlcs */

	list_for_each_safe(p, n, &s->dlcs) {

		d = list_entry(p, struct rfcomm_dlc, list);
@@ -1188,7 +1188,6 @@ static struct rfcomm_session *rfcomm_recv_dm(struct rfcomm_session *s, u8 dlci) 
		else

			err = ECONNRESET;



		s->state = BT_CLOSED;

		s = rfcomm_session_close(s, err);

	}

	return s;
@@ -1224,7 +1223,6 @@ static struct rfcomm_session *rfcomm_recv_disc(struct rfcomm_session *s, 
		else

			err = ECONNRESET;



		s->state = BT_CLOSED;

		s = rfcomm_session_close(s, err);

	}

	return s;
@@ -1921,7 +1919,6 @@ static struct rfcomm_session *rfcomm_check_connection(struct rfcomm_session *s) 
		break;



	case BT_CLOSED:

		s->state = BT_CLOSED;

		s = rfcomm_session_close(s, sk->sk_err);

		break;

	}