Bluetooth: Change interleaved discovery behavior

According to last discussion on IRC, if an interleaved discovery is
issued, but the device is not dual mode, we should return error
instead of performing a regular BR/EDR or LE-only discovery.

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>

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index c4d3bc9..b0c43fe 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -2540,29 +2540,6 @@ unlock:
        return err;
 }
 
-static int discovery(struct hci_dev *hdev)
-{
-       int err;
-
-       if (lmp_host_le_capable(hdev)) {
-               if (lmp_bredr_capable(hdev)) {
-                       err = hci_le_scan(hdev, LE_SCAN_TYPE,
-                                               LE_SCAN_INT, LE_SCAN_WIN,
-                                               LE_SCAN_TIMEOUT_BREDR_LE);
-               } else {
-                       hdev->discovery.type = DISCOV_TYPE_LE;
-                       err = hci_le_scan(hdev, LE_SCAN_TYPE,
-                                               LE_SCAN_INT, LE_SCAN_WIN,
-                                               LE_SCAN_TIMEOUT_LE_ONLY);
-               }
-       } else {
-               hdev->discovery.type = DISCOV_TYPE_BREDR;
-               err = hci_do_inquiry(hdev, INQUIRY_LEN_BREDR);
-       }
-
-       return err;
-}
-
 int mgmt_interleaved_discovery(struct hci_dev *hdev)
 {
        int err;
@@ -2632,7 +2609,11 @@ static int start_discovery(struct sock *sk, u16 index,
                break;
 
        case DISCOV_TYPE_INTERLEAVED:
-               err = discovery(hdev);
+               if (lmp_host_le_capable(hdev) && lmp_bredr_capable(hdev))
+                       err = hci_le_scan(hdev, LE_SCAN_TYPE, LE_SCAN_INT,
+                                       LE_SCAN_WIN, LE_SCAN_TIMEOUT_BREDR_LE);
+               else
+                       err = -ENOTSUPP;
                break;
 
        default: