ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bluetooth: fix invalid-bdaddr quirk for non-persistent setup

Browse Source 
Devices that lack persistent storage for the device address can indicate
this by setting the HCI_QUIRK_INVALID_BDADDR which causes the controller
to be marked as unconfigured until user space has set a valid address.

Once configured, the device address must be set on every setup for
controllers with HCI_QUIRK_NON_PERSISTENT_SETUP to avoid marking the
controller as unconfigured and requiring the address to be set again.

Fixes: 740011cfe9 ("Bluetooth: Add new quirk for non-persistent setup settings")
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Johan Hovold
2023-05-31 11:04:23 +02:00
committed by Jakub Kicinski
parent f752a0b334
commit 0cb7365850
1 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
net/bluetooth/hci_sync.c
View File

@@ -4626,25 +4626,19 @@ static int hci_dev_setup_sync(struct hci_dev *hdev)
invalid_bdaddr = test_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks); invalid_bdaddr = test_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks);
if (!ret) { if (!ret) {
if (test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks)) { if (test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks) &&
if (!bacmp(&hdev->public_addr, BDADDR_ANY)) !bacmp(&hdev->public_addr, BDADDR_ANY))
hci_dev_get_bd_addr_from_property(hdev); hci_dev_get_bd_addr_from_property(hdev);
if (bacmp(&hdev->public_addr, BDADDR_ANY) && if ((invalid_bdaddr ||
test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks)) &&
bacmp(&hdev->public_addr, BDADDR_ANY) &&
hdev->set_bdaddr) { hdev->set_bdaddr) {
ret = hdev->set_bdaddr(hdev, ret = hdev->set_bdaddr(hdev, &hdev->public_addr);
&hdev->public_addr);
/* If setting of the BD_ADDR from the device
* property succeeds, then treat the address
* as valid even if the invalid BD_ADDR
* quirk indicates otherwise.
*/
if (!ret) if (!ret)
invalid_bdaddr = false; invalid_bdaddr = false;
} }
} }
}
/* The transport driver can set these quirks before /* The transport driver can set these quirks before
* creating the HCI device or in its setup callback. * creating the HCI device or in its setup callback.