From: johan.hedberg@gmail.com
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH 3/5] Bluetooth: Add missing error handling for Set Connectable
Date: Mon, 14 Oct 2013 16:20:05 +0300 [thread overview]
Message-ID: <1381756807-14900-4-git-send-email-johan.hedberg@gmail.com> (raw)
In-Reply-To: <1381756807-14900-1-git-send-email-johan.hedberg@gmail.com>
From: Johan Hedberg <johan.hedberg@intel.com>
If the HCI commands related to the Set Connectable command fail we will
get a non-zero status in the request completion callback. In such a case
we must respond with the appropriate command status message to user space.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---
net/bluetooth/mgmt.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 8dcea77..a5c015c 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -1086,6 +1086,12 @@ static void set_connectable_complete(struct hci_dev *hdev, u8 status)
if (!cmd)
goto unlock;
+ if (status) {
+ u8 mgmt_err = mgmt_status(status);
+ cmd_status(cmd->sk, cmd->index, cmd->opcode, mgmt_err);
+ goto remove_cmd;
+ }
+
cp = cmd->param;
if (cp->val)
changed = !test_and_set_bit(HCI_CONNECTABLE, &hdev->dev_flags);
@@ -1097,6 +1103,7 @@ static void set_connectable_complete(struct hci_dev *hdev, u8 status)
if (changed)
new_settings(hdev, cmd->sk);
+remove_cmd:
mgmt_pending_remove(cmd);
unlock:
--
1.8.3.1
next prev parent reply other threads:[~2013-10-14 13:20 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-14 13:20 [PATCH 0/5] Bluetooth: Clean up Set Connectable related code johan.hedberg
2013-10-14 13:20 ` [PATCH 1/5] Bluetooth: Reorganize set_connectable HCI command sending johan.hedberg
2013-10-14 13:20 ` [PATCH 2/5] Bluetooth: Move move logic into set_connectable complete callback johan.hedberg
2013-10-14 13:20 ` johan.hedberg [this message]
2013-10-14 13:20 ` [PATCH 4/5] Bluetooth: Move static advertising functions to avoid forward declarations johan.hedberg
2013-10-14 13:20 ` [PATCH 5/5] Bluetooth: Fix updating advertising data needlessly johan.hedberg
2013-10-14 13:46 ` [PATCH 0/5] Bluetooth: Clean up Set Connectable related code Marcel Holtmann
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=1381756807-14900-4-git-send-email-johan.hedberg@gmail.com \
--to=johan.hedberg@gmail.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