GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-18 12:45:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bluetooth: Pass all message parameters to mgmt_start_discovery

Browse source 
The mgmt_start_discovery command contains the type of discovery that
should be started so this should be passed to the start_discovery
function. This patch doesn't yet add any action depending on the type of
the requested discovery.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
This commit is contained in:
Johan Hedberg 2011-11-12 11:58:22 +02:00 • committed by Gustavo F. Padovan
parent 0e5f875a8f
commit 450dfdafbc
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/net/bluetooth/mgmt.h
View file

@ -232,6 +232,9 @@ struct mgmt_cp_remove_remote_oob_data {
} __packed; } __packed;
#define MGMT_OP_START_DISCOVERY 0x001B #define MGMT_OP_START_DISCOVERY 0x001B
struct mgmt_cp_start_discovery {
__u8 type;
} __packed;
#define MGMT_OP_STOP_DISCOVERY 0x001C #define MGMT_OP_STOP_DISCOVERY 0x001C

10
net/bluetooth/mgmt.c
View file

@ -1779,14 +1779,20 @@ static int remove_remote_oob_data(struct sock *sk, u16 index,
return err; return err;
} }
static int start_discovery(struct sock *sk, u16 index) static int start_discovery(struct sock *sk, u16 index,
unsigned char *data, u16 len)
{ {
struct mgmt_cp_start_discovery *cp = (void *) data;
struct pending_cmd *cmd; struct pending_cmd *cmd;
struct hci_dev *hdev; struct hci_dev *hdev;
int err; int err;
BT_DBG("hci%u", index); BT_DBG("hci%u", index);
if (len != sizeof(*cp))
return cmd_status(sk, index, MGMT_OP_START_DISCOVERY,
MGMT_STATUS_INVALID_PARAMS);
hdev = hci_dev_get(index); hdev = hci_dev_get(index);
if (!hdev) if (!hdev)
return cmd_status(sk, index, MGMT_OP_START_DISCOVERY, return cmd_status(sk, index, MGMT_OP_START_DISCOVERY,
@ -2083,7 +2089,7 @@ int mgmt_control(struct sock *sk, struct msghdr *msg, size_t msglen)
len); len);
break; break;
case MGMT_OP_START_DISCOVERY: case MGMT_OP_START_DISCOVERY:
err = start_discovery(sk, index); err = start_discovery(sk, index, buf + sizeof(*hdr), len);
break; break;
case MGMT_OP_STOP_DISCOVERY: case MGMT_OP_STOP_DISCOVERY:
err = stop_discovery(sk, index); err = stop_discovery(sk, index);