lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bluetooth: mgmt: Add address type parameter to Discovering event

Browse Source 
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>
This commit is contained in:
Johan Hedberg
2012-02-20 23:30:44 +02:00
parent d930650b59
commit f963e8e9d3
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/bluetooth/mgmt.h
View File

@@ -402,6 +402,10 @@ struct mgmt_ev_device_found {
} __packed; } __packed;
#define MGMT_EV_DISCOVERING 0x0013 #define MGMT_EV_DISCOVERING 0x0013
struct mgmt_ev_discovering {
__u8 type;
__u8 discovering;
} __packed;
#define MGMT_EV_DEVICE_BLOCKED 0x0014 #define MGMT_EV_DEVICE_BLOCKED 0x0014
struct mgmt_ev_device_blocked { struct mgmt_ev_device_blocked {

3
net/bluetooth/hci_core.c
View File

@@ -363,10 +363,9 @@ void hci_discovery_set_state(struct hci_dev *hdev, int state)
switch (state) { switch (state) {
case DISCOVERY_STOPPED: case DISCOVERY_STOPPED:
hdev->discovery.type = 0;
if (hdev->discovery.state != DISCOVERY_STARTING) if (hdev->discovery.state != DISCOVERY_STARTING)
mgmt_discovering(hdev, 0); mgmt_discovering(hdev, 0);
hdev->discovery.type = 0;
break; break;
case DISCOVERY_STARTING: case DISCOVERY_STARTING:
break; break;

8
net/bluetooth/mgmt.c
View File

@@ -3392,6 +3392,7 @@ int mgmt_stop_discovery_failed(struct hci_dev *hdev, u8 status)
int mgmt_discovering(struct hci_dev *hdev, u8 discovering) int mgmt_discovering(struct hci_dev *hdev, u8 discovering)
{ {
struct mgmt_ev_discovering ev;
struct pending_cmd *cmd; struct pending_cmd *cmd;
BT_DBG("%s discovering %u", hdev->name, discovering); 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); mgmt_pending_remove(cmd);
} }
return mgmt_event(MGMT_EV_DISCOVERING, hdev, &discovering, memset(&ev, 0, sizeof(ev));
sizeof(discovering), NULL); 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) int mgmt_device_blocked(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type)