summaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_core.c
diff options
context:
space:
mode:
authorMarcel Holtmann2014-07-02 00:53:47 +0200
committerMarcel Holtmann2014-07-03 17:42:55 +0200
commit24c457e27076beb2a85b4213642a6388eb88f240 (patch)
tree85f11e4c435b6ae1b9de9f038577e91578c3b52f /net/bluetooth/hci_core.c
parentBluetooth: Introduce "New Connection Parameter" Event (diff)
downloadkernel-qcow2-linux-24c457e27076beb2a85b4213642a6388eb88f240.tar.gz
kernel-qcow2-linux-24c457e27076beb2a85b4213642a6388eb88f240.tar.xz
kernel-qcow2-linux-24c457e27076beb2a85b4213642a6388eb88f240.zip
Bluetooth: Add support for hdev->set_bdaddr callback handling
Some embedded controllers allow the programming of a public address and this adds vendor support for supporting OEM confguration of such addresses. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth/hci_core.c')
-rw-r--r--net/bluetooth/hci_core.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 615d0cf5e511..63197d70d8eb 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -2249,6 +2249,17 @@ static int hci_dev_do_open(struct hci_dev *hdev)
if (hdev->setup && test_bit(HCI_SETUP, &hdev->dev_flags))
ret = hdev->setup(hdev);
+ /* If public address change is configured, ensure that the
+ * address gets programmed. If the driver does not support
+ * changing the public address, fail the power on procedure.
+ */
+ if (!ret && bacmp(&hdev->public_addr, BDADDR_ANY)) {
+ if (hdev->set_bdaddr)
+ ret = hdev->set_bdaddr(hdev, &hdev->public_addr);
+ else
+ ret = -EADDRNOTAVAIL;
+ }
+
if (!ret) {
if (!test_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks) &&
!test_bit(HCI_USER_CHANNEL, &hdev->dev_flags))