Bluetooth: Add hci_update_random_address() convenience function (ebd3a747) · Commits · 戴 / test

include/net/bluetooth/hci_core.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -1257,6 +1257,8 @@ void hci_le_conn_update(struct hci_conn *conn, u16 min, u16 max,
		void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __u8 rand[8],
		__u8 ltk[16]);

		int hci_update_random_address(struct hci_request req, u8 own_addr_type);

		#define SCO_AIRMODE_MASK 0x0003
		#define SCO_AIRMODE_CVSD 0x0000
		#define SCO_AIRMODE_TRANSP 0x0003

net/bluetooth/hci_core.c

+55 −0

Original line number	Diff line number	Diff line
		@@ -3276,6 +3276,61 @@ static void le_scan_disable_work(struct work_struct *work)
		BT_ERR("Disable LE scanning request failed: err %d", err);
		}

		int hci_update_random_address(struct hci_request req, u8 own_addr_type)
		{
		struct hci_dev *hdev = req->hdev;
		int err;

		/* If privacy is enabled use a resolvable private address. If
		* the current RPA has expired or there's something else than an
		* RPA currently in use regenerate a new one.
		*/
		if (test_bit(HCI_PRIVACY, &hdev->dev_flags)) {
		bdaddr_t rpa;
		int to;

		*own_addr_type = ADDR_LE_DEV_RANDOM;

		if (!test_and_clear_bit(HCI_RPA_EXPIRED, &hdev->dev_flags) &&
		hci_bdaddr_is_rpa(&hdev->random_addr, ADDR_LE_DEV_RANDOM))
		return 0;

		err = smp_generate_rpa(hdev->tfm_aes, hdev->irk, &rpa);
		if (err < 0) {
		BT_ERR("%s failed to generate new RPA", hdev->name);
		return err;
		}

		hci_req_add(req, HCI_OP_LE_SET_RANDOM_ADDR, 6, &rpa);

		to = msecs_to_jiffies(hdev->rpa_timeout * 1000);
		queue_delayed_work(hdev->workqueue, &hdev->rpa_expired, to);

		return 0;
		}

		/* If forcing static address is in use or there is no public
		* address use the static address as random address (but skip
		* the HCI command if the current random address is already the
		* static one.
		*/
		if (test_bit(HCI_FORCE_STATIC_ADDR, &hdev->dev_flags) \|\|
		!bacmp(&hdev->bdaddr, BDADDR_ANY)) {
		*own_addr_type = ADDR_LE_DEV_RANDOM;
		if (bacmp(&hdev->static_addr, &hdev->random_addr))
		hci_req_add(req, HCI_OP_LE_SET_RANDOM_ADDR, 6,
		&hdev->static_addr);
		return 0;
		}

		/* Neither privacy nor static address is being used so use a
		* public address.
		*/
		*own_addr_type = ADDR_LE_DEV_PUBLIC;

		return 0;
		}

		/* Alloc HCI device */
		struct hci_dev *hci_alloc_dev(void)
		{

Admin message