[patch] Patch for inclusion 2/4

2451_rfcomm-get-device-function-call-move.patch (text/plain), 1.24 KB, created by Mike Pagano on 2014-01-17 20:32:01 UTC

--- a/net/bluetooth/rfcomm/tty.c	2014-01-17 14:17:08.330265902 -0500
+++ b/net/bluetooth/rfcomm/tty.c	2014-01-17 14:18:51.300266256 -0500
@@ -103,6 +103,22 @@ static void rfcomm_dev_destruct(struct t
 	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)
 {
@@ -169,22 +185,6 @@ static struct rfcomm_dev *rfcomm_dev_get
 	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);