summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2014-02-23 18:42:23 +0100
committerMarcel Holtmann <marcel@holtmann.org>2014-02-23 21:24:26 +0100
commit8f2a0601a5d68d0dbd2221613dda7fb6fee32a6b (patch)
tree13d963eed1cd1450471c9828f0432b07d4e26563 /net
parentBluetooth: Use hci_update_random_address() when connecting LE (diff)
downloadlinux-8f2a0601a5d68d0dbd2221613dda7fb6fee32a6b.tar.xz
linux-8f2a0601a5d68d0dbd2221613dda7fb6fee32a6b.zip
Bluetooth: Use hci_update_random_address() for enabling advertising
When we enable advertising we need to update the local random address if necessary. This patch takes advantage of the hci_update_random_address() function to set the own_address_type variable 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')
-rw-r--r--net/bluetooth/mgmt.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 4522da18d8e5..8df287ba9ba3 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -839,13 +839,17 @@ static void enable_advertising(struct hci_request *req)
{
struct hci_dev *hdev = req->hdev;
struct hci_cp_le_set_adv_param cp;
- u8 enable = 0x01;
+ u8 own_addr_type, enable = 0x01;
memset(&cp, 0, sizeof(cp));
+
+ if (hci_update_random_address(req, &own_addr_type) < 0)
+ return;
+
cp.min_interval = __constant_cpu_to_le16(0x0800);
cp.max_interval = __constant_cpu_to_le16(0x0800);
cp.type = get_adv_type(hdev);
- cp.own_address_type = hdev->own_addr_type;
+ cp.own_address_type = own_addr_type;
cp.channel_map = hdev->le_adv_channel_map;
hci_req_add(req, HCI_OP_LE_SET_ADV_PARAM, sizeof(cp), &cp);