From: johan.hedberg@gmail.com
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH 4/4] Bluetooth: mgmt: Fix Set SSP check for supported feature
Date: Tue, 21 Feb 2012 00:24:36 +0200 [thread overview]
Message-ID: <1329776676-22800-4-git-send-email-johan.hedberg@gmail.com> (raw)
In-Reply-To: <1329776676-22800-1-git-send-email-johan.hedberg@gmail.com>
From: Johan Hedberg <johan.hedberg@intel.com>
If the local controller doesn't support SSP we should always return an
error for the Set SSP command.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---
net/bluetooth/mgmt.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 4281331..508354a 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -1065,6 +1065,12 @@ static int set_ssp(struct sock *sk, u16 index, void *data, u16 len)
goto failed;
}
+ if (!(hdev->features[6] & LMP_SIMPLE_PAIR)) {
+ err = cmd_status(sk, index, MGMT_OP_SET_SSP,
+ MGMT_STATUS_NOT_SUPPORTED);
+ goto failed;
+ }
+
if (mgmt_pending_find(MGMT_OP_SET_SSP, hdev)) {
err = cmd_status(sk, index, MGMT_OP_SET_SSP, MGMT_STATUS_BUSY);
goto failed;
--
1.7.9
next prev parent reply other threads:[~2012-02-20 22:24 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-20 22:24 [PATCH 1/4] Bluetooth: mgmt: Add address type parameter to Stop Discovery command johan.hedberg
2012-02-20 22:24 ` [PATCH 2/4] Bluetooth: mgmt: Add address type parameter to Discovering event johan.hedberg
2012-02-20 22:26 ` Marcel Holtmann
2012-02-20 22:24 ` [PATCH 3/4] Bluetooth: mgmt: Add basic support for Set High Speed command johan.hedberg
2012-02-20 22:26 ` Marcel Holtmann
2012-02-20 22:24 ` johan.hedberg [this message]
2012-02-20 22:27 ` [PATCH 4/4] Bluetooth: mgmt: Fix Set SSP check for supported feature Marcel Holtmann
2012-02-20 22:25 ` [PATCH 1/4] Bluetooth: mgmt: Add address type parameter to Stop Discovery command 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=1329776676-22800-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;
as well as URLs for NNTP newsgroup(s).