]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Bluetooth: Allow only one LE connection attempt
authorAndrzej Kaczmarek <andrzej.kaczmarek@tieto.com>
Wed, 30 May 2012 13:39:21 +0000 (15:39 +0200)
committerJohan Hedberg <johan.hedberg@intel.com>
Tue, 5 Jun 2012 03:34:15 +0000 (06:34 +0300)
Only one outgoing LE connection attempt should be possible.
hci_connect() will now return -EBUSY in case there's another pending
outgoing connection.

Signed-off-by: Andrzej Kaczmarek <andrzej.kaczmarek@tieto.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
net/bluetooth/hci_conn.c

index 1458667b284532bf8485c15e73e948f78e3db999..2fcced377e503ad2e9feded38ec5609748e7d2ff 100644 (file)
@@ -483,6 +483,11 @@ struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst,
        if (type == LE_LINK) {
                le = hci_conn_hash_lookup_ba(hdev, LE_LINK, dst);
                if (!le) {
+                       le = hci_conn_hash_lookup_state(hdev, LE_LINK,
+                                                       BT_CONNECT);
+                       if (le)
+                               return ERR_PTR(-EBUSY);
+
                        le = hci_conn_add(hdev, LE_LINK, dst);
                        if (!le)
                                return ERR_PTR(-ENOMEM);