Bluetooth: Use random address if public address is not available

For single mode LE-only controllers, it is possible that they come
without a public address. If a public address is not available,
then use the random address for connection establishment and
scanning.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 8b0d08fb615804bc98a5a5066936bb97f0fc6335..2a220a8c98692d71ad3f808b1e5a06ada8cf46aa 100644 (file)
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -59,6 +59,10 @@ static void hci_le_create_connection(struct hci_conn *conn)
        cp.scan_window = __constant_cpu_to_le16(0x0030);
        bacpy(&cp.peer_addr, &conn->dst);
        cp.peer_addr_type = conn->dst_type;
+       if (bacmp(&hdev->bdaddr, BDADDR_ANY))
+               cp.own_address_type = ADDR_LE_DEV_PUBLIC;
+       else
+               cp.own_address_type = ADDR_LE_DEV_RANDOM;
        cp.conn_interval_min = __constant_cpu_to_le16(0x0028);
        cp.conn_interval_max = __constant_cpu_to_le16(0x0038);
        cp.supervision_timeout = __constant_cpu_to_le16(0x002a);

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 6e808d1d78f39f0abd6175692ba2562cf73530af..719672203d02ec8726350b751f67ba084e830037 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -2911,6 +2911,10 @@ static int start_discovery(struct sock *sk, struct hci_dev *hdev,
                param_cp.type = LE_SCAN_ACTIVE;
                param_cp.interval = cpu_to_le16(DISCOV_LE_SCAN_INT);
                param_cp.window = cpu_to_le16(DISCOV_LE_SCAN_WIN);
+               if (bacmp(&hdev->bdaddr, BDADDR_ANY))
+                       param_cp.own_address_type = ADDR_LE_DEV_PUBLIC;
+               else
+                       param_cp.own_address_type = ADDR_LE_DEV_RANDOM;
                hci_req_add(&req, HCI_OP_LE_SET_SCAN_PARAM, sizeof(param_cp),
                            &param_cp);