summaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_core.c
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2014-07-10 12:09:06 +0300
committerMarcel Holtmann <marcel@holtmann.org>2014-07-10 11:14:20 +0200
commit031547d8688a0fc5da875b504bf11e6c2e18390e (patch)
tree62f574afedc2f30552496cc6fc371961b039762c /net/bluetooth/hci_core.c
parent7fabc0f4c7bd2206c368a79e3ed79b7d36625cfd (diff)
downloadop-kernel-dev-031547d8688a0fc5da875b504bf11e6c2e18390e.zip
op-kernel-dev-031547d8688a0fc5da875b504bf11e6c2e18390e.tar.gz
Bluetooth: Remove unneeded mgmt_connectable function
The mgmt_connectable function has been used to ensure that the right actions to HCI_CONNECTABLE are taken when the HCI_Write_Scan_Enable command is triggered by something else than mgmt. The only other user that we really care about is the HCISETSCAN ioctl code, so we can actually more simply perform the needed changes there instead. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/hci_core.c')
-rw-r--r--net/bluetooth/hci_core.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 8f9df76..3844eeb 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -2717,9 +2717,9 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg)
HCI_INIT_TIMEOUT);
/* Ensure that the connectable state gets correctly
- * notified if the whitelist is in use.
+ * modified as this was a non-mgmt change.
*/
- if (!err && !list_empty(&hdev->whitelist)) {
+ if (!err) {
bool changed;
if ((dr.dev_opt & SCAN_PAGE))
@@ -2729,7 +2729,7 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg)
changed = test_and_clear_bit(HCI_CONNECTABLE,
&hdev->dev_flags);
- if (changed)
+ if (changed && test_bit(HCI_MGMT, &hdev->dev_flags))
mgmt_new_settings(hdev);
}
break;
OpenPOWER on IntegriCloud