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>

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 01fbbe20defbb9b11069d384347538a6c831e622..ee480a86e5584a9787a075d3a470bc796f6e8ac1 100644 (file)
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -171,6 +171,7 @@ struct hci_dev {
        __u8            bus;
        __u8            dev_type;
        bdaddr_t        bdaddr;
+       bdaddr_t        public_addr;
        bdaddr_t        random_addr;
        bdaddr_t        static_addr;
        __u8            adv_addr_type;
@@ -344,6 +345,7 @@ struct hci_dev {
        int (*setup)(struct hci_dev *hdev);
        int (*send)(struct hci_dev *hdev, struct sk_buff *skb);
        void (*notify)(struct hci_dev *hdev, unsigned int evt);
+       int (*set_bdaddr)(struct hci_dev *hdev, const bdaddr_t *bdaddr);
 };
 
 #define HCI_PHY_HANDLE(handle) (handle & 0xff)

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 615d0cf5e511225285c946b69d1f6503377e7793..63197d70d8eb4d954ac1b97489d36f260187b8cb 100644 (file)
--- 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))