summaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorAndre Guedes <andre.guedes@openbossa.org>2012-02-23 18:09:27 -0300
committerGustavo F. Padovan <padovan@profusion.mobi>2012-03-01 12:12:53 -0300
commit8b90129cc5789a4c65547c91c9a7b1fd3a4d56a4 (patch)
tree16e8be2df2d6bb0de2c5b13bacbb2023d300bdcc /net/bluetooth
parent1de028ceb54ccd28cc96f1530a195ae1b6a6d5b5 (diff)
downloadop-kernel-dev-8b90129cc5789a4c65547c91c9a7b1fd3a4d56a4.zip
op-kernel-dev-8b90129cc5789a4c65547c91c9a7b1fd3a4d56a4.tar.gz
Bluetooth: Check capabilities in BR/EDR and LE-Only discovery
This patch add an extra check for BR/EDR and LE-Only discovery. This way, we are able to return error immediately if the discovery type requested is not supported by the device. 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')
-rw-r--r--net/bluetooth/mgmt.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index abf1adb..3fcccad 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -2602,12 +2602,18 @@ static int start_discovery(struct sock *sk, u16 index,
switch (hdev->discovery.type) {
case DISCOV_TYPE_BREDR:
- err = hci_do_inquiry(hdev, INQUIRY_LEN_BREDR);
+ if (lmp_bredr_capable(hdev))
+ err = hci_do_inquiry(hdev, INQUIRY_LEN_BREDR);
+ else
+ err = -ENOTSUPP;
break;
case DISCOV_TYPE_LE:
- err = hci_le_scan(hdev, LE_SCAN_TYPE, LE_SCAN_INT,
+ if (lmp_host_le_capable(hdev))
+ err = hci_le_scan(hdev, LE_SCAN_TYPE, LE_SCAN_INT,
LE_SCAN_WIN, LE_SCAN_TIMEOUT_LE_ONLY);
+ else
+ err = -ENOTSUPP;
break;
case DISCOV_TYPE_INTERLEAVED:
OpenPOWER on IntegriCloud