summaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_core.c
diff options
context:
space:
mode:
authorJohan Hedberg2012-02-20 22:30:44 +0100
committerJohan Hedberg2012-02-20 23:32:16 +0100
commitf963e8e9d3652f4a8065d969206707a1c21ff9b0 (patch)
tree712829fed5127bdf2a9b822a48bff52360cd27ac /net/bluetooth/hci_core.c
parentBluetooth: mgmt: Add address type parameter to Stop Discovery command (diff)
downloadkernel-qcow2-linux-f963e8e9d3652f4a8065d969206707a1c21ff9b0.tar.gz
kernel-qcow2-linux-f963e8e9d3652f4a8065d969206707a1c21ff9b0.tar.xz
kernel-qcow2-linux-f963e8e9d3652f4a8065d969206707a1c21ff9b0.zip
Bluetooth: mgmt: Add address type parameter to Discovering event
This patch adds an address type parameter to the Discovering event. The value matches that given to Start/Stop Discovery. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Acked-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/hci_core.c')
-rw-r--r--net/bluetooth/hci_core.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index cc52e037440e..a7439aeb1f9b 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -363,10 +363,9 @@ void hci_discovery_set_state(struct hci_dev *hdev, int state)
switch (state) {
case DISCOVERY_STOPPED:
- hdev->discovery.type = 0;
-
if (hdev->discovery.state != DISCOVERY_STARTING)
mgmt_discovering(hdev, 0);
+ hdev->discovery.type = 0;
break;
case DISCOVERY_STARTING:
break;