Commit 7bf32048 authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Remove unneeded hdev->own_addr_type 



Now that the identity address type is always looked up for all
successful connections, the hdev->own_addr_type variable has become
completely unnecessary. Simply remove it.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent e26b1ffa

include/net/bluetooth/hci_core.h

+0 −1
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ struct hci_dev { 
	bdaddr_t	bdaddr;

	bdaddr_t	random_addr;

	bdaddr_t	static_addr;

	__u8		own_addr_type;

	__u8		dev_name[HCI_MAX_NAME_LENGTH];

	__u8		short_name[HCI_MAX_SHORT_NAME_LENGTH];

	__u8		eir[HCI_MAX_EIR_LENGTH];

net/bluetooth/hci_core.c

+1 −16
Original line number Diff line number Diff line
@@ -1506,23 +1506,8 @@ static void hci_init3_req(struct hci_request *req, unsigned long opt) 
	if (hdev->commands[5] & 0x10)

		hci_setup_link_policy(req);



	if (lmp_le_capable(hdev)) {

		/* 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 random address.

		 *

		 * For debugging purposes it is possible to force

		 * controllers with a public address to use the

		 * random address instead.

		 */

		if (test_bit(HCI_FORCE_STATIC_ADDR, &hdev->dev_flags) ||

		    !bacmp(&hdev->bdaddr, BDADDR_ANY))

			hdev->own_addr_type = ADDR_LE_DEV_RANDOM;

		else

			hdev->own_addr_type = ADDR_LE_DEV_PUBLIC;



	if (lmp_le_capable(hdev))

		hci_set_le_support(req);

	}



	/* Read features beyond page 1 if available */

	for (p = 2; p < HCI_MAX_PAGES && p <= hdev->max_page; p++) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE