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

Commit 0f3adeae authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

Bluetooth: Remove BlueFritz! specific check from initialization 



The AVM BlueFritz! USB controllers had a special handling in the
Bluetooth core when it comes to reading the supported commands.

Both drivers now set the HCI_QUIRK_BROKEN_LOCAL_COMMANDS and with
that it is no longer needed to look for vendor specific details.

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

net/bluetooth/hci_core.c

+9 −3
Original line number Diff line number Diff line
@@ -623,10 +623,16 @@ static void hci_init2_req(struct hci_request *req, unsigned long opt) 
	if (lmp_le_capable(hdev))

		le_setup(req);



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

	 * local supported commands HCI command.

	/* All Bluetooth 1.2 and later controllers should support the

	 * HCI command for reading the local supported commands.

	 *

	 * Unfortunately some controllers indicate Bluetooth 1.2 support,

	 * but do not have support for this command. If that is the case,

	 * the driver can quirk the behavior and skip reading the local

	 * supported commands.

	 */

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

	if (hdev->hci_ver > BLUETOOTH_VER_1_1 &&

	    !test_bit(HCI_QUIRK_BROKEN_LOCAL_COMMANDS, &hdev->quirks))

		hci_req_add(req, HCI_OP_READ_LOCAL_COMMANDS, 0, NULL);



	if (lmp_ssp_capable(hdev)) {