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

Bluetooth: Refactor set_connectable settings update to separate function 



We will need to directly update the device flags and notify user space
of the new settings not just when we're powered off but also if it turns
out that there are no HCI commands to send (which can happen in
particular when BR/EDR is disabled). Since this is a considerable amount
of code, refactor it to a separate function so it can be reused for the
"no HCI commands to send" case.

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

net/bluetooth/mgmt.c

+27 −19
Original line number Diff line number Diff line
@@ -1381,6 +1381,32 @@ unlock: 
	hci_dev_unlock(hdev);

}



static int set_connectable_update_settings(struct hci_dev *hdev,

					   struct sock *sk, u8 val)

{

	bool changed = false;

	int err;



	if (!!val != test_bit(HCI_CONNECTABLE, &hdev->dev_flags))

		changed = true;



	if (val) {

		set_bit(HCI_CONNECTABLE, &hdev->dev_flags);

	} else {

		clear_bit(HCI_CONNECTABLE, &hdev->dev_flags);

		clear_bit(HCI_DISCOVERABLE, &hdev->dev_flags);

	}



	err = send_settings_rsp(sk, MGMT_OP_SET_CONNECTABLE, hdev);

	if (err < 0)

		return err;



	if (changed)

		return new_settings(hdev, sk);



	return 0;

}



static int set_connectable(struct sock *sk, struct hci_dev *hdev, void *data,

			   u16 len)

{
@@ -1404,25 +1430,7 @@ static int set_connectable(struct sock *sk, struct hci_dev *hdev, void *data, 
	hci_dev_lock(hdev);



	if (!hdev_is_powered(hdev)) {

		bool changed = false;



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

			changed = true;



		if (cp->val) {

			set_bit(HCI_CONNECTABLE, &hdev->dev_flags);

		} else {

			clear_bit(HCI_CONNECTABLE, &hdev->dev_flags);

			clear_bit(HCI_DISCOVERABLE, &hdev->dev_flags);

		}



		err = send_settings_rsp(sk, MGMT_OP_SET_CONNECTABLE, hdev);

		if (err < 0)

			goto failed;



		if (changed)

			err = new_settings(hdev, sk);



		err = set_connectable_update_settings(hdev, sk, cp->val);

		goto failed;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE