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

Commit 1a47aee8 authored by Johan Hedberg's avatar Johan Hedberg Committed by Gustavo Padovan
Browse files

Bluetooth: Limit fast connectable support to >= 1.2 controllers 



The HCI commands that are necessary for fast connectable mode are only
available from HCI specification version 1.2 onwards. This should be
reflected in the supported settings as well as error response for the
set_fast_connectable command when dealing with a < 1.2 capable
controller.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 33e38b3e

net/bluetooth/mgmt.c

+3 −2
Original line number Diff line number Diff line
@@ -384,6 +384,7 @@ static u32 get_supported_settings(struct hci_dev *hdev) 


	if (lmp_bredr_capable(hdev)) {

		settings |= MGMT_SETTING_CONNECTABLE;

		if (hdev->hci_ver >= BLUETOOTH_VER_1_2)

			settings |= MGMT_SETTING_FAST_CONNECTABLE;

		settings |= MGMT_SETTING_DISCOVERABLE;

		settings |= MGMT_SETTING_BREDR;
@@ -2934,7 +2935,7 @@ static int set_fast_connectable(struct sock *sk, struct hci_dev *hdev, 


	BT_DBG("%s", hdev->name);



	if (!lmp_bredr_capable(hdev))

	if (!lmp_bredr_capable(hdev) || hdev->hci_ver < BLUETOOTH_VER_1_2)

		return cmd_status(sk, hdev->id, MGMT_OP_SET_FAST_CONNECTABLE,

				  MGMT_STATUS_NOT_SUPPORTED);