Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bluetooth: mgmt: Fix New Settings event for connectable/discoverable

Browse source 
When powered off and doing changes to the Connectable or Discoverable
setting we should also send an appropriate New Settings event in
addition to the command response.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Johan Hedberg 2012-02-21 19:40:05 +02:00
parent beadb2bddc
commit 0224d2fafb
1 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
net/bluetooth/mgmt.c
View file

@ -876,11 +876,20 @@ static int set_discoverable(struct sock *sk, u16 index, void *data, u16 len)
} }
if (!hdev_is_powered(hdev)) { if (!hdev_is_powered(hdev)) {
if (cp->val) bool changed = false;
set_bit(HCI_DISCOVERABLE, &hdev->dev_flags);
else if (!!cp->val != test_bit(HCI_DISCOVERABLE, &hdev->dev_flags)) {
clear_bit(HCI_DISCOVERABLE, &hdev->dev_flags); change_bit(HCI_DISCOVERABLE, &hdev->dev_flags);
changed = true;
}
err = send_settings_rsp(sk, MGMT_OP_SET_DISCOVERABLE, hdev); err = send_settings_rsp(sk, MGMT_OP_SET_DISCOVERABLE, hdev);
if (err < 0)
goto failed;
if (changed)
err = new_settings(hdev, sk);
goto failed; goto failed;
} }
@ -938,13 +947,25 @@ static int set_connectable(struct sock *sk, u16 index, void *data, u16 len)
hci_dev_lock(hdev); hci_dev_lock(hdev);
if (!hdev_is_powered(hdev)) { if (!hdev_is_powered(hdev)) {
bool changed = false;
if (!!cp->val != test_bit(HCI_CONNECTABLE, &hdev->dev_flags))
changed = true;
if (cp->val) if (cp->val)
set_bit(HCI_CONNECTABLE, &hdev->dev_flags); set_bit(HCI_CONNECTABLE, &hdev->dev_flags);
else { else {
clear_bit(HCI_CONNECTABLE, &hdev->dev_flags); clear_bit(HCI_CONNECTABLE, &hdev->dev_flags);
clear_bit(HCI_DISCOVERABLE, &hdev->dev_flags); clear_bit(HCI_DISCOVERABLE, &hdev->dev_flags);
} }
err = send_settings_rsp(sk, MGMT_OP_SET_CONNECTABLE, hdev); err = send_settings_rsp(sk, MGMT_OP_SET_CONNECTABLE, hdev);
if (err < 0)
goto failed;
if (changed)
err = new_settings(hdev, sk);
goto failed; goto failed;
} }