diff options
| author | Andre Guedes <andre.guedes@openbossa.org> | 2012-02-17 20:39:38 -0300 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-19 12:34:55 +0200 |
| commit | 5e0452c00a2e4b04ec1482248c897dacf106f1df (patch) | |
| tree | 34bbd940ed96cc736dcd8dd9311414f8f035839e /net/bluetooth/hci_event.c | |
| parent | 343f935bfa44189c68527102c409286b0cfc4526 (diff) | |
| download | op-kernel-dev-5e0452c00a2e4b04ec1482248c897dacf106f1df.zip op-kernel-dev-5e0452c00a2e4b04ec1482248c897dacf106f1df.tar.gz | |
Bluetooth: Interleaved discovery support
This patch adds interleaved discovery support to MGMT Start
Discovery command.
In case interleaved discovery is not supported (not a dual mode
device), we perform BR/EDR or LE-only discovery according to the
device capabilities.
Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth/hci_event.c')
| -rw-r--r-- | net/bluetooth/hci_event.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 9aea7b8..04fb1f0 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -1090,11 +1090,16 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev, clear_bit(HCI_LE_SCAN, &hdev->dev_flags); - hci_dev_lock(hdev); - hci_discovery_set_state(hdev, DISCOVERY_STOPPED); - hci_dev_unlock(hdev); - schedule_delayed_work(&hdev->adv_work, ADV_CLEAR_TIMEOUT); + + if (hdev->discovery.type == DISCOV_TYPE_INTERLEAVED) { + mgmt_interleaved_discovery(hdev); + } else { + hci_dev_lock(hdev); + hci_discovery_set_state(hdev, DISCOVERY_STOPPED); + hci_dev_unlock(hdev); + } + break; default: |
