xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bluetooth: Add hci_copy_identity_address convenience function

Browse Source 
The number of places needing the local Identity Address are starting to
grow so it's better to have a single place for the logic of determining
it. This patch adds a convenience function for getting the Identity
Address and updates the two current places needing this to use it.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Johan Hedberg
2014-02-27 14:05:41 +02:00
committed by Marcel Holtmann
parent 56ed2cb88c
commit a1f4c3188b
3 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
net/bluetooth/hci_event.c
View File

@@ -3665,23 +3665,8 @@ static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
/* Ensure that the hci_conn contains the identity address type
* regardless of which address the connection was made with.
*
* If the controller has a public BD_ADDR, then by default
* use that one. If this is a LE only controller without
* a public address, default to the static random address.
*
* For debugging purposes it is possible to force
* controllers with a public address to use the static
* random address instead.
*/
if (test_bit(HCI_FORCE_STATIC_ADDR, &hdev->dev_flags) ||
!bacmp(&hdev->bdaddr, BDADDR_ANY)) {
bacpy(&conn->src, &hdev->static_addr);
conn->src_type = ADDR_LE_DEV_RANDOM;
} else {
bacpy(&conn->src, &hdev->bdaddr);
conn->src_type = ADDR_LE_DEV_PUBLIC;
}
hci_copy_identity_address(hdev, &conn->src, &conn->src_type);
/* Lookup the identity address from the stored connection
* address and address type.