summaryrefslogtreecommitdiff
path: root/net/bluetooth/mgmt.c
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2013-03-15 22:07:07 (GMT)
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2013-03-18 17:02:07 (GMT)
commit05cbf29f84f2cf17554b58a3ab4a0ac46d52eca6 (patch)
treefc6912ce2d2f64e9b8fe8d5d3a980243137da879 /net/bluetooth/mgmt.c
parent1a47aee85f8a0803b879abb2e331d6354eb975ac (diff)
downloadlinux-05cbf29f84f2cf17554b58a3ab4a0ac46d52eca6.tar.xz
Bluetooth: Fix error response for simultaneous fast connectable commands
If there's another pending mgmt_set_fast_connectable command we should return a "busy" error response. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth/mgmt.c')
-rw-r--r--net/bluetooth/mgmt.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 34caf30..e89938e0 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -2953,6 +2953,12 @@ static int set_fast_connectable(struct sock *sk, struct hci_dev *hdev,
hci_dev_lock(hdev);
+ if (mgmt_pending_find(MGMT_OP_SET_FAST_CONNECTABLE, hdev)) {
+ err = cmd_status(sk, hdev->id, MGMT_OP_SET_FAST_CONNECTABLE,
+ MGMT_STATUS_BUSY);
+ goto unlock;
+ }
+
if (cp->val) {
type = PAGE_SCAN_TYPE_INTERLACED;