diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2015-01-03 08:35:19 +0100 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2015-01-03 21:31:09 +0100 |
| commit | 043ec9bf7b9d7cdce84d2e8d3df9b9eb520d929e (patch) | |
| tree | 4b2c9f738009ca612e1817f4d5067f717bc0935a | |
| parent | Bluetooth: Remove dead code for manufacturer inquiry mode quirks (diff) | |
| download | linux-043ec9bf7b9d7cdce84d2e8d3df9b9eb520d929e.tar.xz linux-043ec9bf7b9d7cdce84d2e8d3df9b9eb520d929e.zip | |
Bluetooth: Introduce HCI_QUIRK_FIXUP_INQUIRY_MODE option
The HCI_QUIRK_FIXUP_INQUIRY_MODE option allows to force Inquiry Result
with RSSI setting on controllers that do not indicate support for it,
but where it is known to be fully functional.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
| -rw-r--r-- | include/net/bluetooth/hci.h | 12 | ||||
| -rw-r--r-- | net/bluetooth/hci_core.c | 3 |
2 files changed, 14 insertions, 1 deletions
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index aee16bf5d34f..d0bca316b43b 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -102,6 +102,18 @@ enum { */ HCI_QUIRK_FIXUP_BUFFER_SIZE, + /* When this quirk is set, then a controller that does not + * indicate support for Inquiry Result with RSSI is assumed to + * support it anyway. Some early Bluetooth 1.2 controllers had + * wrongly configured local features that will require forcing + * them to enable this mode. Getting RSSI information with the + * inquiry responses is preferred since it allows for a better + * user expierence. + * + * This quirk must be set before hci_register_dev is called. + */ + HCI_QUIRK_FIXUP_INQUIRY_MODE, + /* When this quirk is set, then the HCI Read Local Supported * Commands command is not supported. In general Bluetooth 1.2 * and later controllers should support this command. However diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index ebac859e1258..bc5486ea5411 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -621,7 +621,8 @@ static void hci_init2_req(struct hci_request *req, unsigned long opt) } } - if (lmp_inq_rssi_capable(hdev)) { + if (lmp_inq_rssi_capable(hdev) || + test_bit(HCI_QUIRK_FIXUP_INQUIRY_MODE, &hdev->quirks)) { u8 mode; /* If Extended Inquiry Result events are supported, then |