From: Jakub Pawlowski <jpawlowski@google.com>
To: linux-bluetooth@vger.kernel.org
Cc: Jakub Pawlowski <jpawlowski@google.com>
Subject: [PATCH v4 3/7] Bluetooth: Split triggering le and interleaved scan into separate cases
Date: Mon, 16 Mar 2015 18:37:30 -0700 [thread overview]
Message-ID: <1426556254-1480-3-git-send-email-jpawlowski@google.com> (raw)
In-Reply-To: <1426556254-1480-1-git-send-email-jpawlowski@google.com>
This patch splits triggering of le and interleaved scan into
separate cases.
Signed-off-by: Jakub Pawlowski <jpawlowski@google.com>
---
net/bluetooth/mgmt.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 92fa8e88..9d3c7a1 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -4009,9 +4009,13 @@ static bool trigger_discovery(struct hci_request *req, u8 *status)
break;
case DISCOV_TYPE_LE:
+ if (!trigger_le_scan(req, status,
+ cpu_to_le16(DISCOV_LE_SCAN_INT)))
+ return false;
+ break;
+
case DISCOV_TYPE_INTERLEAVED:
- if (hdev->discovery.type == DISCOV_TYPE_INTERLEAVED &&
- !hci_dev_test_flag(hdev, HCI_BREDR_ENABLED)) {
+ if (!hci_dev_test_flag(hdev, HCI_BREDR_ENABLED)) {
*status = MGMT_STATUS_NOT_SUPPORTED;
return false;
}
--
2.2.0.rc0.207.ga3a616c
next prev parent reply other threads:[~2015-03-17 1:37 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-17 1:37 [PATCH v4 1/7] Bluetooth: Introduce HCI_QUIRK_SIMULTANEOUS_DISCOVERY Jakub Pawlowski
2015-03-17 1:37 ` [PATCH v4 2/7] Bluetooth: Refactor BREDR inquiry and LE scan triggering Jakub Pawlowski
2015-03-17 2:18 ` Marcel Holtmann
2015-03-17 1:37 ` Jakub Pawlowski [this message]
2015-03-17 2:18 ` [PATCH v4 3/7] Bluetooth: Split triggering le and interleaved scan into separate cases Marcel Holtmann
2015-03-17 1:37 ` [PATCH v4 4/7] Bluetooth: Add simultaneous dual mode scan Jakub Pawlowski
2015-03-17 2:18 ` Marcel Holtmann
2015-03-17 1:37 ` [PATCH v4 5/7] Bluetooth: Set HCI_QUIRK_SIMULTANEOUS_DISCOVERY for BTUSB_ATH3012 Jakub Pawlowski
2015-03-17 1:37 ` [PATCH v4 6/7] Bluetooth: Set HCI_QUIRK_SIMULTANEOUS_DISCOVERY for BTUSB_INTEL Jakub Pawlowski
2015-03-17 2:19 ` Marcel Holtmann
2015-03-17 1:37 ` [PATCH v4 7/7] Bluetooth: Set HCI_QUIRK_SIMULTANEOUS_DISCOVERY for BTUSB_CSR Jakub Pawlowski
2015-03-17 2:18 ` [PATCH v4 1/7] Bluetooth: Introduce HCI_QUIRK_SIMULTANEOUS_DISCOVERY 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=1426556254-1480-3-git-send-email-jpawlowski@google.com \
--to=jpawlowski@google.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