Bluetooth: Send new settings only when pairable changes
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>
This commit is contained in:
Родитель
1514b8928e
Коммит
5559435654
|
@ -1188,6 +1188,7 @@ static int set_pairable(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||||
u16 len)
|
u16 len)
|
||||||
{
|
{
|
||||||
struct mgmt_mode *cp = data;
|
struct mgmt_mode *cp = data;
|
||||||
|
bool changed;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
BT_DBG("request for %s", hdev->name);
|
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);
|
hci_dev_lock(hdev);
|
||||||
|
|
||||||
if (cp->val)
|
if (cp->val)
|
||||||
set_bit(HCI_PAIRABLE, &hdev->dev_flags);
|
changed = !test_and_set_bit(HCI_PAIRABLE, &hdev->dev_flags);
|
||||||
else
|
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);
|
err = send_settings_rsp(sk, MGMT_OP_SET_PAIRABLE, hdev);
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
goto failed;
|
goto unlock;
|
||||||
|
|
||||||
err = new_settings(hdev, sk);
|
if (changed)
|
||||||
|
err = new_settings(hdev, sk);
|
||||||
|
|
||||||
failed:
|
unlock:
|
||||||
hci_dev_unlock(hdev);
|
hci_dev_unlock(hdev);
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче