mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 23:27:06 +00:00
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>
This commit is contained in:
parent
978c93b90f
commit
426c189a1b
1 changed files with 5 additions and 24 deletions
|
@ -2540,29 +2540,6 @@ static int remove_remote_oob_data(struct sock *sk, u16 index,
|
||||||
return err;
|
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 mgmt_interleaved_discovery(struct hci_dev *hdev)
|
||||||
{
|
{
|
||||||
int err;
|
int err;
|
||||||
|
@ -2632,7 +2609,11 @@ static int start_discovery(struct sock *sk, u16 index,
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case DISCOV_TYPE_INTERLEAVED:
|
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;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
|
Loading…
Reference in a new issue