Revert "Bluetooth: Remove rfcomm_carrier_raised()"
This reverts commitf86772af6a
. 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()". Commit4a2fb3ecc7
, "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: Peter Hurley <peter@hurleysoftware.com> Tested-By: Alexander Holler <holler@ahsoftware.de> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
parent
9b7655eafe
commit
7f717b91dd
|
@ -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)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue