Bluetooth: Send new settings only when pairable changes (55594356) · Commits · 戴 / test

In case the current value of pairable is already configured, do not send a new settings event indicating that something has changed while in reality everything is the same. Signed-off-by:

Marcel Holtmann <marcel@holtmann.org> Signed-off-by:

Johan Hedberg <johan.hedberg@intel.com>

net/bluetooth/mgmt.c

+7 −5

Original line number	Diff line number	Diff line
		@@ -1188,6 +1188,7 @@ static int set_pairable(struct sock sk, struct hci_dev hdev, void *data,
		u16 len)
		{
		struct mgmt_mode *cp = data;
		bool changed;
		int err;

		BT_DBG("request for %s", hdev->name);
		@@ -1199,17 +1200,18 @@ static int set_pairable(struct sock sk, struct hci_dev hdev, void *data,
		hci_dev_lock(hdev);

		if (cp->val)
		set_bit(HCI_PAIRABLE, &hdev->dev_flags);
		changed = !test_and_set_bit(HCI_PAIRABLE, &hdev->dev_flags);
		else
		clear_bit(HCI_PAIRABLE, &hdev->dev_flags);
		changed = test_and_clear_bit(HCI_PAIRABLE, &hdev->dev_flags);

		err = send_settings_rsp(sk, MGMT_OP_SET_PAIRABLE, hdev);
		if (err < 0)
		goto failed;
		goto unlock;

		if (changed)
		err = new_settings(hdev, sk);

		failed:
		unlock:
		hci_dev_unlock(hdev);
		return err;
		}

Admin message