Commit e411443c authored by Luiz Augusto von Dentz's avatar Luiz Augusto von Dentz
Browse files

Bluetooth: hci_sync: Fix not setting static address 



This attempts to program the address stored in hdev->static_addr after
the init sequence has been complete:

@ MGMT Command: Set Static A.. (0x002b) plen 6
        Address: C0:55:44:33:22:11 (Static)
@ MGMT Event: Command Complete (0x0001) plen 7
      Set Static Address (0x002b) plen 4
        Status: Success (0x00)
        Current settings: 0x00008200
          Low Energy
          Static Address
@ MGMT Event: New Settings (0x0006) plen 4
        Current settings: 0x00008200
          Low Energy
          Static Address
< HCI Command: LE Set Random.. (0x08|0x0005) plen 6
        Address: C0:55:44:33:22:11 (Static)
> HCI Event: Command Complete (0x0e) plen 4
      LE Set Random Address (0x08|0x0005) ncmd 1
        Status: Success (0x00)
@ MGMT Event: Command Complete (0x0001) plen 7
      Set Powered (0x0005) plen 4
        Status: Success (0x00)
        Current settings: 0x00008201
          Powered
          Low Energy
          Static Address
@ MGMT Event: New Settings (0x0006) plen 4
        Current settings: 0x00008201
          Powered
          Low Energy
          Static Address

Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Tested-by: default avatarBrian Gix <brian.gix@intel.com>
parent b3fdb8c9

net/bluetooth/hci_sync.c

+18 −0
Original line number Diff line number Diff line
@@ -3055,6 +3055,7 @@ int hci_update_name_sync(struct hci_dev *hdev) 
 * Enable Authentication

 * lmp_bredr_capable(Set Fast Connectable -> Set Scan Type -> Set Class ->

 * Set Name -> Set EIR)

 * HCI_FORCE_STATIC_ADDR | BDADDR_ANY && !HCI_BREDR_ENABLED (Set Static Address)

 */

int hci_powered_update_sync(struct hci_dev *hdev)

{
@@ -3094,6 +3095,23 @@ int hci_powered_update_sync(struct hci_dev *hdev) 
		hci_update_eir_sync(hdev);

	}



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

	 *

	 * In case BR/EDR has been disabled on a dual-mode controller

	 * and a static address has been configured, then use that

	 * address instead of the public BR/EDR address.

	 */

	if (hci_dev_test_flag(hdev, HCI_FORCE_STATIC_ADDR) ||

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

	    !hci_dev_test_flag(hdev, HCI_BREDR_ENABLED))) {

		if (bacmp(&hdev->static_addr, BDADDR_ANY))

			return hci_set_random_addr_sync(hdev,

							&hdev->static_addr);

	}



	return 0;

}