summaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_conn.c
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2014-02-23 19:42:22 +0200
committerMarcel Holtmann <marcel@holtmann.org>2014-02-23 12:24:26 -0800
commit85030be4c5ce39e709b2cb5d4f8ee8779af8e50b (patch)
tree0d4f552bfc5c51326933b8bcf9ac20d8453b0675 /net/bluetooth/hci_conn.c
parentebd3a74765377b7528bb372aab2890638790301d (diff)
downloadop-kernel-dev-85030be4c5ce39e709b2cb5d4f8ee8779af8e50b.zip
op-kernel-dev-85030be4c5ce39e709b2cb5d4f8ee8779af8e50b.tar.gz
Bluetooth: Use hci_update_random_address() when connecting LE
When we initiate LE connections we need to update the local random address if necessary. This patch updates the LE connection creation mechanism to use the new hci_update_random_address() function to set the own_address_type parameter and to update the local random address if necessary. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/hci_conn.c')
-rw-r--r--net/bluetooth/hci_conn.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index bd66c52e..4cb337d 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -556,16 +556,22 @@ static int hci_create_le_conn(struct hci_conn *conn)
struct hci_dev *hdev = conn->hdev;
struct hci_cp_le_create_conn cp;
struct hci_request req;
+ u8 own_addr_type;
int err;
hci_req_init(&req, hdev);
memset(&cp, 0, sizeof(cp));
+
+ err = hci_update_random_address(&req, &own_addr_type);
+ if (err < 0)
+ return err;
+
cp.scan_interval = cpu_to_le16(hdev->le_scan_interval);
cp.scan_window = cpu_to_le16(hdev->le_scan_window);
bacpy(&cp.peer_addr, &conn->dst);
cp.peer_addr_type = conn->dst_type;
- cp.own_address_type = conn->src_type;
+ cp.own_address_type = own_addr_type;
cp.conn_interval_min = cpu_to_le16(conn->le_conn_min_interval);
cp.conn_interval_max = cpu_to_le16(conn->le_conn_max_interval);
cp.supervision_timeout = __constant_cpu_to_le16(0x002a);
OpenPOWER on IntegriCloud