aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/mgmt.c
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2014-12-07 14:13:17 -0500
committerJohan Hedberg <johan.hedberg@intel.com>2014-12-08 02:21:14 -0500
commit9437d2edc39ed8f7e40536281ee53ec3fd5a14ca (patch)
tree8b27ff6119909ebf1da97f58e4dfbe03ae8edc15 /net/bluetooth/mgmt.c
parent08f63cc5026f20b9124828619c9025738ecb5a5e (diff)
Bluetooth: Fix generation of non-resolvable private addresses
When the host decides to use a non-resolvable private address, it must ensure that this generated address does not match the public address of the controller. Add an extra check to ensure this required behavior. In addition rename the variable from urpa to nrpa and fix all of the comments in the code that use the term unresolvable instead of the term non-resolvable as used in the Bluetooth specification. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth/mgmt.c')
-rw-r--r--net/bluetooth/mgmt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index a91e484886fe..44b20deb6038 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -3791,7 +3791,7 @@ static bool trigger_discovery(struct hci_request *req, u8 *status)
3791 3791
3792 /* All active scans will be done with either a resolvable 3792 /* All active scans will be done with either a resolvable
3793 * private address (when privacy feature has been enabled) 3793 * private address (when privacy feature has been enabled)
3794 * or unresolvable private address. 3794 * or non-resolvable private address.
3795 */ 3795 */
3796 err = hci_update_random_address(req, true, &own_addr_type); 3796 err = hci_update_random_address(req, true, &own_addr_type);
3797 if (err < 0) { 3797 if (err < 0) {