summaryrefslogtreecommitdiffstats
path: root/include/net/bluetooth
diff options
context:
space:
mode:
authorJohan Hedberg2014-02-28 19:26:13 +0100
committerMarcel Holtmann2014-02-28 19:28:17 +0100
commit81ad6fd9698f659dbabdc6cd3e1667a98eb2be3b (patch)
treec60df62c7d343cf39dd9927f99fcd2b54e7b0785 /include/net/bluetooth
parentBluetooth: Fix trying to disable scanning twice (diff)
downloadkernel-qcow2-linux-81ad6fd9698f659dbabdc6cd3e1667a98eb2be3b.tar.gz
kernel-qcow2-linux-81ad6fd9698f659dbabdc6cd3e1667a98eb2be3b.tar.xz
kernel-qcow2-linux-81ad6fd9698f659dbabdc6cd3e1667a98eb2be3b.zip
Bluetooth: Remove unnecessary stop_scan_complete function
The stop_scan_complete function was used as an intermediate step before doing the actual connection creation. Since we're using hci_request there's no reason to have this extra function around, i.e. we can simply put both HCI commands into the same request. The single task that the intermediate function had, i.e. indicating discovery as stopped is now taken care of by a new HCI_LE_SCAN_INTERRUPTED flag which allows us to do the discovery state update when the stop scan command completes. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'include/net/bluetooth')
-rw-r--r--include/net/bluetooth/hci.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 0409f0119d2b..be150cf8cd43 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -140,6 +140,7 @@ enum {
HCI_FAST_CONNECTABLE,
HCI_BREDR_ENABLED,
HCI_6LOWPAN_ENABLED,
+ HCI_LE_SCAN_INTERRUPTED,
};
/* A mask for the flags that are supposed to remain when a reset happens