summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2014-07-04 17:23:35 +0200
committerJohan Hedberg <johan.hedberg@intel.com>2014-07-04 21:10:22 +0300
commit0ad184ef5828542e3e73cce8a875fb4e029725b7 (patch)
treeeffaaa20f81cb77ed073ec9f2c9f19a96ca18fcf
parentaf202f84415a69b964a9ec371e11781f2a1e5396 (diff)
downloadop-kernel-dev-0ad184ef5828542e3e73cce8a875fb4e029725b7.zip
op-kernel-dev-0ad184ef5828542e3e73cce8a875fb4e029725b7.tar.gz
Bluetooth: Support HCI_QUIRK_EXTERNAL_CONFIG for hci_vhci driver
This adds support for configuring the hci_vhci virtual controllers to require a setup stage using HCI_QUIRK_EXTERNAL_CONFIG. With this option the virtual controller will start out as unconfigured. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
-rw-r--r--drivers/bluetooth/hci_vhci.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
index aa446c7..5bb5872 100644
--- a/drivers/bluetooth/hci_vhci.c
+++ b/drivers/bluetooth/hci_vhci.c
@@ -107,8 +107,8 @@ static int vhci_create_device(struct vhci_data *data, __u8 opcode)
if (dev_type != HCI_BREDR && dev_type != HCI_AMP)
return -EINVAL;
- /* bits 2-6 are reserved (must be zero) */
- if (opcode & 0x7c)
+ /* bits 2-5 are reserved (must be zero) */
+ if (opcode & 0x3c)
return -EINVAL;
skb = bt_skb_alloc(4, GFP_KERNEL);
@@ -132,6 +132,10 @@ static int vhci_create_device(struct vhci_data *data, __u8 opcode)
hdev->flush = vhci_flush;
hdev->send = vhci_send_frame;
+ /* bit 6 is for external configuration */
+ if (opcode & 0x40)
+ set_bit(HCI_QUIRK_EXTERNAL_CONFIG, &hdev->quirks);
+
/* bit 7 is for raw device */
if (opcode & 0x80)
set_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks);
OpenPOWER on IntegriCloud