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

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

Revert "Bluetooth: Move rfcomm_get_device() before rfcomm_dev_activate()" 



This reverts commit e228b633.

This is the third of a 3-patch revert, together with
Revert "Bluetooth: Remove rfcomm_carrier_raised()" and
Revert "Bluetooth: Always wait for a connection on RFCOMM open()".

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 136c373b

net/bluetooth/rfcomm/tty.c

+16 −16
Original line number Diff line number Diff line
@@ -103,22 +103,6 @@ static void rfcomm_dev_destruct(struct tty_port *port) 
	module_put(THIS_MODULE);

}



static struct device *rfcomm_get_device(struct rfcomm_dev *dev)

{

	struct hci_dev *hdev;

	struct hci_conn *conn;



	hdev = hci_get_route(&dev->dst, &dev->src);

	if (!hdev)

		return NULL;



	conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &dev->dst);



	hci_dev_put(hdev);



	return conn ? &conn->dev : NULL;

}



/* device-specific initialization: open the dlc */

static int rfcomm_dev_activate(struct tty_port *port, struct tty_struct *tty)

{
@@ -185,6 +169,22 @@ static struct rfcomm_dev *rfcomm_dev_get(int id) 
	return dev;

}



static struct device *rfcomm_get_device(struct rfcomm_dev *dev)

{

	struct hci_dev *hdev;

	struct hci_conn *conn;



	hdev = hci_get_route(&dev->dst, &dev->src);

	if (!hdev)

		return NULL;



	conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &dev->dst);



	hci_dev_put(hdev);



	return conn ? &conn->dev : NULL;

}



static ssize_t show_address(struct device *tty_dev, struct device_attribute *attr, char *buf)

{

	struct rfcomm_dev *dev = dev_get_drvdata(tty_dev);