From: johan.hedberg@gmail.com
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH 2/6] Bluetooth: mgmt: Fix Removing discoverable timeout in set_connectable
Date: Tue, 21 Feb 2012 19:43:45 +0200 [thread overview]
Message-ID: <1329846229-7919-2-git-send-email-johan.hedberg@gmail.com> (raw)
In-Reply-To: <1329846229-7919-1-git-send-email-johan.hedberg@gmail.com>
From: Johan Hedberg <johan.hedberg@intel.com>
When switching connectable mode off any pending discoverable timeout
must also be disabled to avoid duplicate write_scan_enable commands.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---
net/bluetooth/mgmt.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 6311be7..eec70a4 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -935,9 +935,14 @@ static int set_connectable(struct sock *sk, u16 index, void *data, u16 len)
if (cp->val)
scan = SCAN_PAGE;
- else
+ else {
scan = 0;
+ if (test_bit(HCI_ISCAN, &hdev->flags) &&
+ hdev->discov_timeout > 0)
+ cancel_delayed_work(&hdev->discov_off);
+ }
+
err = hci_send_cmd(hdev, HCI_OP_WRITE_SCAN_ENABLE, 1, &scan);
if (err < 0)
mgmt_pending_remove(cmd);
--
1.7.9
next prev parent reply other threads:[~2012-02-21 17:43 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-21 17:43 [PATCH 1/6] Bluetooth: mgmt: Allow connectable/discoverable changes in off state johan.hedberg
2012-02-21 17:43 ` johan.hedberg [this message]
2012-02-22 8:09 ` [PATCH 2/6] Bluetooth: mgmt: Fix Removing discoverable timeout in set_connectable Andrei Emeltchenko
2012-02-21 17:43 ` [PATCH 3/6] Bluetooth: mgmt: Fix current settings values when powered off johan.hedberg
2012-02-21 17:43 ` [PATCH 4/6] Bluetooth: mgmt: Add convenience function for sending New Settings johan.hedberg
2012-02-21 17:43 ` [PATCH 5/6] Bluetooth: mgmt: Fix New Settings event for connectable/discoverable johan.hedberg
2012-02-21 17:43 ` [PATCH 6/6] Bluetooth: Fix clearing of persistent dev_flags johan.hedberg
2012-02-22 8:05 ` [PATCH 1/6] Bluetooth: mgmt: Allow connectable/discoverable changes in off state Andrei Emeltchenko
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=1329846229-7919-2-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).