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

Bluetooth: Refactor ioctl scan state update to its own function

Browse source 
With subsequent patches we'll also need to update the discoverable
state. As the code grows bigger it's better to move this out from the
switch statement into its own function.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Johan Hedberg 2014-07-10 12:09:07 +03:00 committed by Marcel Holtmann
parent 031547d868
commit 123abc0833
1 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
net/bluetooth/hci_core.c
View file

@ -2655,6 +2655,26 @@ int hci_dev_reset_stat(__u16 dev)
return ret;
}
static void hci_update_scan_state(struct hci_dev *hdev, u8 scan)
{
bool conn_changed;
BT_DBG("%s scan 0x%02x", hdev->name, scan);
if ((scan & SCAN_PAGE))
conn_changed = !test_and_set_bit(HCI_CONNECTABLE,
&hdev->dev_flags);
else
conn_changed = test_and_clear_bit(HCI_CONNECTABLE,
&hdev->dev_flags);
if (!test_bit(HCI_MGMT, &hdev->dev_flags))
return;
if (conn_changed)
mgmt_new_settings(hdev);
}
int hci_dev_cmd(unsigned int cmd, void __user *arg)
{
struct hci_dev *hdev;
@ -2719,19 +2739,8 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg)
/* Ensure that the connectable state gets correctly
* modified as this was a non-mgmt change.
*/
if (!err) {
bool changed;
if ((dr.dev_opt & SCAN_PAGE))
changed = !test_and_set_bit(HCI_CONNECTABLE,
&hdev->dev_flags);
else
changed = test_and_clear_bit(HCI_CONNECTABLE,
&hdev->dev_flags);
if (changed && test_bit(HCI_MGMT, &hdev->dev_flags))
mgmt_new_settings(hdev);
}
if (!err)
hci_update_scan_state(hdev, dr.dev_opt);
break;
case HCISETLINKPOL: