From 4dd78f8a4e8104969c23a5b8131f6c0cc4950c4b Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@intel.com>
Date: Mon, 20 Feb 2012 23:30:44 +0200
Subject: [PATCH] --- yaml --- r: 290995 b: refs/heads/master c:
 f963e8e9d3652f4a8065d969206707a1c21ff9b0 h: refs/heads/master i:   290993:
 aadc6b9deb710f139e0469f41ff8e04f9ecd66e4   290991:
 51bfb23084f96ba93bf9b957497bbb74627c5f59 v: v3

---
 [refs]                             | 2 +-
 trunk/include/net/bluetooth/mgmt.h | 4 ++++
 trunk/net/bluetooth/hci_core.c     | 3 +--
 trunk/net/bluetooth/mgmt.c         | 8 ++++++--
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 877b98aba30c..f9d2afd66a11 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d930650b59be72342bc373ef52006ca99c1dd09e
+refs/heads/master: f963e8e9d3652f4a8065d969206707a1c21ff9b0
diff --git a/trunk/include/net/bluetooth/mgmt.h b/trunk/include/net/bluetooth/mgmt.h
index 870a3deab6ea..1dbadbe14785 100644
--- a/trunk/include/net/bluetooth/mgmt.h
+++ b/trunk/include/net/bluetooth/mgmt.h
@@ -402,6 +402,10 @@ struct mgmt_ev_device_found {
 } __packed;
 
 #define MGMT_EV_DISCOVERING		0x0013
+struct mgmt_ev_discovering {
+	__u8 type;
+	__u8 discovering;
+} __packed;
 
 #define MGMT_EV_DEVICE_BLOCKED		0x0014
 struct mgmt_ev_device_blocked {
diff --git a/trunk/net/bluetooth/hci_core.c b/trunk/net/bluetooth/hci_core.c
index cc52e037440e..a7439aeb1f9b 100644
--- a/trunk/net/bluetooth/hci_core.c
+++ b/trunk/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;
diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c
index 3db8525b0293..86148b182891 100644
--- a/trunk/net/bluetooth/mgmt.c
+++ b/trunk/net/bluetooth/mgmt.c
@@ -3392,6 +3392,7 @@ int mgmt_stop_discovery_failed(struct hci_dev *hdev, u8 status)
 
 int mgmt_discovering(struct hci_dev *hdev, u8 discovering)
 {
+	struct mgmt_ev_discovering ev;
 	struct pending_cmd *cmd;
 
 	BT_DBG("%s discovering %u", hdev->name, discovering);
@@ -3409,8 +3410,11 @@ int mgmt_discovering(struct hci_dev *hdev, u8 discovering)
 		mgmt_pending_remove(cmd);
 	}
 
-	return mgmt_event(MGMT_EV_DISCOVERING, hdev, &discovering,
-						sizeof(discovering), NULL);
+	memset(&ev, 0, sizeof(ev));
+	ev.type = hdev->discovery.type;
+	ev.discovering = discovering;
+
+	return mgmt_event(MGMT_EV_DISCOVERING, hdev, &ev, sizeof(ev), NULL);
 }
 
 int mgmt_device_blocked(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type)