diff options
| author |   Andrzej Kaczmarek <andrzej.kaczmarek@tieto.com> | 2012-05-30 15:39:22 +0200 |
|---|---|---|
| committer |   Johan Hedberg <johan.hedberg@intel.com> | 2012-06-05 06:34:15 +0300 |
| commit | 489dc48e7583d825304b0aff3fc17e706627b3c8 (patch) | |
| tree | 57d2dfc28807a5a42fbceafbb8e365bd1c54342f /net/bluetooth | |
| parent | Bluetooth: Allow only one LE connection attempt (diff) | |
| download | linux-dev-489dc48e7583d825304b0aff3fc17e706627b3c8.tar.xz linux-dev-489dc48e7583d825304b0aff3fc17e706627b3c8.zip | |
Bluetooth: Return proper mgmt state when LE pairing connection failed
MGMT_STATUS_BUSY should be returned when LE pairing cannot be started due
to another outgoing connection attempt is ongoing.
Signed-off-by: Andrzej Kaczmarek <andrzej.kaczmarek@tieto.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/mgmt.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 205574edff20..958f764cc6ab 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -1911,8 +1911,15 @@ static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data, rp.addr.type = cp->addr.type; if (IS_ERR(conn)) { + int status; + + if (PTR_ERR(conn) == -EBUSY) + status = MGMT_STATUS_BUSY; + else + status = MGMT_STATUS_CONNECT_FAILED; + err = cmd_complete(sk, hdev->id, MGMT_OP_PAIR_DEVICE, - MGMT_STATUS_CONNECT_FAILED, &rp, + status, &rp, sizeof(rp)); goto unlock; } |