lkml.org 
[lkml]   [2014]   [Feb]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 03/24] Revert "Bluetooth: Move rfcomm_get_device() before rfcomm_dev_activate()"
    Date
    This reverts commit e228b63390536f5b737056059a9a04ea016b1abf.

    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 4a2fb3ecc7467c775b154813861f25a0ddc11aa0,
    "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>
    ---
    net/bluetooth/rfcomm/tty.c | 32 ++++++++++++++++----------------
    1 file changed, 16 insertions(+), 16 deletions(-)

    diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
    index 32ef9f9..a535ef1 100644
    --- a/net/bluetooth/rfcomm/tty.c
    +++ b/net/bluetooth/rfcomm/tty.c
    @@ -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);
    --
    1.8.1.2


    \
     
     \ /
      Last update: 2014-02-10 04:01    [W:4.675 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site