openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Marcel Holtmann 2013-10-06 16:11:57 -07:00 committed by Johan Hedberg
parent 1514b8928e
commit 5559435654
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/bluetooth/mgmt.c
View File

@ -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;
err = new_settings(hdev, sk);
if (changed)
err = new_settings(hdev, sk);
failed:
unlock:
hci_dev_unlock(hdev);
return err;
}