aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/mgmt.c
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2012-02-20 16:30:44 -0500
committerJohan Hedberg <johan.hedberg@intel.com>2012-02-20 17:32:16 -0500
commitf963e8e9d3652f4a8065d969206707a1c21ff9b0 (patch)
tree712829fed5127bdf2a9b822a48bff52360cd27ac /net/bluetooth/mgmt.c
parentd930650b59be72342bc373ef52006ca99c1dd09e (diff)
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/mgmt.c')
-rw-r--r--net/bluetooth/mgmt.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 3db8525b0293..86148b182891 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -3392,6 +3392,7 @@ int mgmt_stop_discovery_failed(struct hci_dev *hdev, u8 status)
3392 3392
3393int mgmt_discovering(struct hci_dev *hdev, u8 discovering) 3393int mgmt_discovering(struct hci_dev *hdev, u8 discovering)
3394{ 3394{
3395 struct mgmt_ev_discovering ev;
3395 struct pending_cmd *cmd; 3396 struct pending_cmd *cmd;
3396 3397
3397 BT_DBG("%s discovering %u", hdev->name, discovering); 3398 BT_DBG("%s discovering %u", hdev->name, discovering);
@@ -3409,8 +3410,11 @@ int mgmt_discovering(struct hci_dev *hdev, u8 discovering)
3409 mgmt_pending_remove(cmd); 3410 mgmt_pending_remove(cmd);
3410 } 3411 }
3411 3412
3412 return mgmt_event(MGMT_EV_DISCOVERING, hdev, &discovering, 3413 memset(&ev, 0, sizeof(ev));
3413 sizeof(discovering), NULL); 3414 ev.type = hdev->discovery.type;
3415 ev.discovering = discovering;
3416
3417 return mgmt_event(MGMT_EV_DISCOVERING, hdev, &ev, sizeof(ev), NULL);
3414} 3418}
3415 3419
3416int mgmt_device_blocked(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type) 3420int mgmt_device_blocked(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type)