Bluetooth: Check capabilities in BR/EDR and LE-Only discovery
Andre Guedes [Thu, 23 Feb 2012 21:09:27 +0000 (18:09 -0300)]
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>

net/bluetooth/mgmt.c

index abf1adb..3fcccad 100644 (file)
@@ -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: