Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f8e2d75 authored by Johan Hedberg's avatar Johan Hedberg Committed by Gustavo Padovan
Browse files

Bluetooth: Fix HCI init for BlueFRITZ! devices 



None of the BlueFRITZ! devices with manufacurer ID 31 (AVM Berlin)
support HCI_Read_Local_Supported_Commands. It is safe to use the
manufacturer ID (instead of e.g. a USB ID specific quirk) because the
company never created any newer controllers.

< HCI Command: Read Local Supported Comm.. (0x04|0x0002) plen 0 [hci0] 0.210014
> HCI Event: Command Status (0x0f) plen 4 [hci0] 0.217361
      Read Local Supported Commands (0x04|0x0002) ncmd 1
        Status: Unknown HCI Command (0x01)

Reported-by: default avatarJörg Esser <jackfritt@boh.de>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Tested-by: default avatarJörg Esser <jackfritt@boh.de>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 1d5b569e

net/bluetooth/hci_core.c

+4 −1
Original line number Diff line number Diff line
@@ -513,7 +513,10 @@ static void hci_init2_req(struct hci_request *req, unsigned long opt) 


	hci_setup_event_mask(req);



	if (hdev->hci_ver > BLUETOOTH_VER_1_1)

	/* AVM Berlin (31), aka "BlueFRITZ!", doesn't support the read

	 * local supported commands HCI command.

	 */

	if (hdev->manufacturer != 31 && hdev->hci_ver > BLUETOOTH_VER_1_1)

		hci_req_add(req, HCI_OP_READ_LOCAL_COMMANDS, 0, NULL);



	if (lmp_ssp_capable(hdev)) {