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

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

Bluetooth: Add proper flag for fast connectable mode 



In order to be able to represent fast connectable mode in the mgmt
settings we need to have a HCI dev flag for it. This patch adds the flag
and makes sure its value is changed whenever a mgmt_set_fast_connectable
command completes.

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 05cbf29f

include/net/bluetooth/hci.h

+3 −1
Original line number Diff line number Diff line
@@ -120,12 +120,14 @@ enum { 
	HCI_DISCOVERABLE,

	HCI_LINK_SECURITY,

	HCI_PERIODIC_INQ,

	HCI_FAST_CONNECTABLE,

};



/* A mask for the flags that are supposed to remain when a reset happens

 * or the HCI device is closed.

 */

#define HCI_PERSISTENT_MASK (BIT(HCI_LE_SCAN) | BIT(HCI_PERIODIC_INQ))

#define HCI_PERSISTENT_MASK (BIT(HCI_LE_SCAN) | BIT(HCI_PERIODIC_INQ) | \

			      BIT(HCI_FAST_CONNECTABLE))



/* HCI ioctl defines */

#define HCIDEVUP	_IOW('H', 201, int)

net/bluetooth/mgmt.c

+16 −0
Original line number Diff line number Diff line
@@ -410,6 +410,9 @@ static u32 get_current_settings(struct hci_dev *hdev) 
	if (test_bit(HCI_CONNECTABLE, &hdev->dev_flags))

		settings |= MGMT_SETTING_CONNECTABLE;



	if (test_bit(HCI_FAST_CONNECTABLE, &hdev->dev_flags))

		settings |= MGMT_SETTING_FAST_CONNECTABLE;



	if (test_bit(HCI_DISCOVERABLE, &hdev->dev_flags))

		settings |= MGMT_SETTING_DISCOVERABLE;
@@ -2913,6 +2916,13 @@ static void fast_connectable_complete(struct hci_dev *hdev, u8 status) 
		cmd_status(cmd->sk, hdev->id, MGMT_OP_SET_FAST_CONNECTABLE,

			   mgmt_status(status));

	} else {

		struct mgmt_mode *cp = cmd->param;



		if (cp->val)

			set_bit(HCI_FAST_CONNECTABLE, &hdev->dev_flags);

		else

			clear_bit(HCI_FAST_CONNECTABLE, &hdev->dev_flags);



		send_settings_rsp(cmd->sk, MGMT_OP_SET_FAST_CONNECTABLE, hdev);

		new_settings(hdev, cmd->sk);

	}
@@ -2959,6 +2969,12 @@ static int set_fast_connectable(struct sock *sk, struct hci_dev *hdev, 
		goto unlock;

	}



	if (!!cp->val == test_bit(HCI_FAST_CONNECTABLE, &hdev->dev_flags)) {

		err = send_settings_rsp(sk, MGMT_OP_SET_FAST_CONNECTABLE,

					hdev);

		goto unlock;

	}



	if (cp->val) {

		type = PAGE_SCAN_TYPE_INTERLACED;