summaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth/btusb.c
diff options
context:
space:
mode:
authorMarcel Holtmann2014-07-02 11:25:25 +0200
committerMarcel Holtmann2014-07-03 17:42:56 +0200
commitcb8d65973b57edeec53cd219ddbcb646cfd73452 (patch)
tree21aabd6b9e6a9e685be8c5a28b37dbc32e67f4b5 /drivers/bluetooth/btusb.c
parentBluetooth: Drop LE connections for blocked devices (diff)
downloadkernel-qcow2-linux-cb8d65973b57edeec53cd219ddbcb646cfd73452.tar.gz
kernel-qcow2-linux-cb8d65973b57edeec53cd219ddbcb646cfd73452.tar.xz
kernel-qcow2-linux-cb8d65973b57edeec53cd219ddbcb646cfd73452.zip
Bluetooth: Add public address configration for Intel USB devices
For the Intel based USB devices add support for configuration of the public device address. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'drivers/bluetooth/btusb.c')
-rw-r--r--drivers/bluetooth/btusb.c21
1 files changed, 20 insertions, 1 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index e0e39cc1af31..66966b9c4244 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -1382,6 +1382,23 @@ exit_mfg_deactivate:
return 0;
}
+static int btusb_set_bdaddr_intel(struct hci_dev *hdev, const bdaddr_t *bdaddr)
+{
+ struct sk_buff *skb;
+ long ret;
+
+ skb = __hci_cmd_sync(hdev, 0xfc31, 6, bdaddr, HCI_INIT_TIMEOUT);
+ if (IS_ERR(skb)) {
+ ret = PTR_ERR(skb);
+ BT_ERR("%s: changing Intel device address failed (%ld)",
+ hdev->name, ret);
+ return ret;
+ }
+ kfree_skb(skb);
+
+ return 0;
+}
+
static int btusb_setup_bcm_patchram(struct hci_dev *hdev)
{
struct btusb_data *data = hci_get_drvdata(hdev);
@@ -1657,8 +1674,10 @@ static int btusb_probe(struct usb_interface *intf,
hdev->set_bdaddr = btusb_set_bdaddr_bcm;
}
- if (id->driver_info & BTUSB_INTEL)
+ if (id->driver_info & BTUSB_INTEL) {
hdev->setup = btusb_setup_intel;
+ hdev->set_bdaddr = btusb_set_bdaddr_intel;
+ }
/* Interface numbers are hardcoded in the specification */
data->isoc = usb_ifnum_to_if(data->udev, 1);