Commit ed9b5f2f authored by Johan Hedberg's avatar Johan Hedberg
Browse files

Bluetooth: mgmt: Fix connectable/discoverable response values 



The connectable/discoverable flags need to be changed before sending the
response since otherwise the settings value will be incorrect.

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

net/bluetooth/mgmt.c

+6 −5
Original line number Diff line number Diff line
@@ -2965,8 +2965,6 @@ int mgmt_discoverable(struct hci_dev *hdev, u8 discoverable) 
	bool changed = false;

	int err = 0;



	mgmt_pending_foreach(MGMT_OP_SET_DISCOVERABLE, hdev, settings_rsp, &match);



	if (discoverable) {

		if (!test_and_set_bit(HCI_DISCOVERABLE, &hdev->dev_flags))

			changed = true;
@@ -2975,6 +2973,9 @@ int mgmt_discoverable(struct hci_dev *hdev, u8 discoverable) 
			changed = true;

	}



	mgmt_pending_foreach(MGMT_OP_SET_DISCOVERABLE, hdev, settings_rsp,

								&match);



	if (changed)

		err = new_settings(hdev, match.sk);
@@ -2990,9 +2991,6 @@ int mgmt_connectable(struct hci_dev *hdev, u8 connectable) 
	bool changed = false;

	int err = 0;



	mgmt_pending_foreach(MGMT_OP_SET_CONNECTABLE, hdev, settings_rsp,

								&match);



	if (connectable) {

		if (!test_and_set_bit(HCI_CONNECTABLE, &hdev->dev_flags))

			changed = true;
@@ -3001,6 +2999,9 @@ int mgmt_connectable(struct hci_dev *hdev, u8 connectable) 
			changed = true;

	}



	mgmt_pending_foreach(MGMT_OP_SET_CONNECTABLE, hdev, settings_rsp,

								&match);



	if (changed)

		err = new_settings(hdev, match.sk);