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

Commit 5998e040 authored by Peter Hurley's avatar Peter Hurley Committed by Marcel Holtmann
Browse files

Bluetooth: Refactor deferred setup test in rfcomm_dlc_close() 



Prepare for directly closing dlc if the RFCOMM session has not
yet been started; refactor the deferred setup test for only those
dlc states to which the test applies. Retains functional
equivalence.

Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Tested-By: default avatarAlexander Holler <holler@ahsoftware.de>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 4339c25a

net/bluetooth/rfcomm/core.c

+8 −10
Original line number Diff line number Diff line
@@ -443,11 +443,18 @@ static int __rfcomm_dlc_close(struct rfcomm_dlc *d, int err) 
	switch (d->state) {

	case BT_CONNECT:

	case BT_CONFIG:

	case BT_OPEN:

	case BT_CONNECT2:

		if (test_and_clear_bit(RFCOMM_DEFER_SETUP, &d->flags)) {

			set_bit(RFCOMM_AUTH_REJECT, &d->flags);

			rfcomm_schedule();

			break;

			return 0;

		}

	}



	switch (d->state) {

	case BT_CONNECT:

	case BT_CONFIG:

		/* Fall through */



	case BT_CONNECTED:
@@ -461,15 +468,6 @@ static int __rfcomm_dlc_close(struct rfcomm_dlc *d, int err) 
		}

		break;



	case BT_OPEN:

	case BT_CONNECT2:

		if (test_and_clear_bit(RFCOMM_DEFER_SETUP, &d->flags)) {

			set_bit(RFCOMM_AUTH_REJECT, &d->flags);

			rfcomm_schedule();

			break;

		}

		/* Fall through */



	default:

		rfcomm_dlc_clear_timer(d);