From: Andrzej Kaczmarek <andrzej.kaczmarek@tieto.com>
To: <linux-bluetooth@vger.kernel.org>
Cc: Andrzej Kaczmarek <andrzej.kaczmarek@tieto.com>
Subject: [PATCH 2/3] Bluetooth: Return proper mgmt state when LE pairing connection failed
Date: Wed, 30 May 2012 15:39:22 +0200 [thread overview]
Message-ID: <1338385163-10589-2-git-send-email-andrzej.kaczmarek@tieto.com> (raw)
In-Reply-To: <1338385163-10589-1-git-send-email-andrzej.kaczmarek@tieto.com>
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>
---
net/bluetooth/mgmt.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 205574e..958f764 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;
}
--
1.7.9.5
next prev parent reply other threads:[~2012-05-30 13:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-30 13:39 [PATCH 1/3] Bluetooth: Allow only one LE connection attempt Andrzej Kaczmarek
2012-05-30 13:39 ` Andrzej Kaczmarek [this message]
2012-05-31 18:52 ` [PATCH 2/3] Bluetooth: Return proper mgmt state when LE pairing connection failed Gustavo Padovan
2012-05-30 13:39 ` [PATCH 3/3] Bluetooth: Fix not removing hci_conn for failed LE connection Andrzej Kaczmarek
2012-05-31 18:55 ` Gustavo Padovan
2012-05-31 14:31 ` [PATCH 1/3] Bluetooth: Allow only one LE connection attempt Gustavo Padovan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1338385163-10589-2-git-send-email-andrzej.kaczmarek@tieto.com \
--to=andrzej.kaczmarek@tieto.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox