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

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

Bluetooth: Refactor dlc disconnect logic in rfcomm_dlc_close() 



Prepare for directly closing dlc if the RFCOMM session has not
yet been started; refactor the dlc disconnect logic into a separate
local function, __rfcomm_dlc_disconn(). 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 5998e040

net/bluetooth/rfcomm/core.c

+15 −8
Original line number Diff line number Diff line
@@ -431,6 +431,20 @@ int rfcomm_dlc_open(struct rfcomm_dlc *d, bdaddr_t *src, bdaddr_t *dst, u8 chann 
	return r;

}



static void __rfcomm_dlc_disconn(struct rfcomm_dlc *d)

{

	struct rfcomm_session *s = d->session;



	d->state = BT_DISCONN;

	if (skb_queue_empty(&d->tx_queue)) {

		rfcomm_send_disc(s, d->dlci);

		rfcomm_dlc_set_timer(d, RFCOMM_DISC_TIMEOUT);

	} else {

		rfcomm_queue_disc(d);

		rfcomm_dlc_set_timer(d, RFCOMM_DISC_TIMEOUT * 2);

	}

}



static int __rfcomm_dlc_close(struct rfcomm_dlc *d, int err)

{

	struct rfcomm_session *s = d->session;
@@ -458,14 +472,7 @@ static int __rfcomm_dlc_close(struct rfcomm_dlc *d, int err) 
		/* Fall through */



	case BT_CONNECTED:

		d->state = BT_DISCONN;

		if (skb_queue_empty(&d->tx_queue)) {

			rfcomm_send_disc(s, d->dlci);

			rfcomm_dlc_set_timer(d, RFCOMM_DISC_TIMEOUT);

		} else {

			rfcomm_queue_disc(d);

			rfcomm_dlc_set_timer(d, RFCOMM_DISC_TIMEOUT * 2);

		}

		__rfcomm_dlc_disconn(d);

		break;



	default: