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

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

Revert "Bluetooth: Remove rfcomm_carrier_raised()" 



This reverts commit f86772af.

This is the first of a 3-patch revert, together with
Revert "Bluetooth: Always wait for a connection on RFCOMM open()" and
Revert "Bluetooth: Move rfcomm_get_device() before rfcomm_dev_activate()".

Commit 4a2fb3ec,
"Bluetooth: Always wait for a connection on RFCOMM open()" open-codes
blocking on tty open(), rather than using the default behavior
implemented by the tty port.

The reasons for reverting that patch are detailed in that changelog;
this patch restores required functionality for that revert.

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 9b7655ea

net/bluetooth/rfcomm/tty.c

+8 −0
Original line number Diff line number Diff line
@@ -160,6 +160,14 @@ static int rfcomm_dev_activate(struct tty_port *port, struct tty_struct *tty) 
	return err;

}



/* we block the open until the dlc->state becomes BT_CONNECTED */

static int rfcomm_dev_carrier_raised(struct tty_port *port)

{

	struct rfcomm_dev *dev = container_of(port, struct rfcomm_dev, port);



	return (dev->dlc->state == BT_CONNECTED);

}



/* device-specific cleanup: close the dlc */

static void rfcomm_dev_shutdown(struct tty_port *port)

{