Commit 450dfdaf authored by Johan Hedberg's avatar Johan Hedberg Committed by Gustavo Padovan
Browse files

Bluetooth: Pass all message parameters to mgmt_start_discovery 



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: default avatarJohan Hedberg <johan.hedberg@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 0e5f875a

include/net/bluetooth/mgmt.h

+3 −0
Original line number Diff line number Diff line
@@ -232,6 +232,9 @@ struct mgmt_cp_remove_remote_oob_data { 
} __packed;



#define MGMT_OP_START_DISCOVERY		0x001B

struct mgmt_cp_start_discovery {

	__u8 type;

} __packed;



#define MGMT_OP_STOP_DISCOVERY		0x001C

net/bluetooth/mgmt.c

+8 −2
Original line number Diff line number Diff line
@@ -1779,14 +1779,20 @@ static int remove_remote_oob_data(struct sock *sk, u16 index, 
	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 hci_dev *hdev;

	int err;



	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);

	if (!hdev)

		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);

		break;

	case MGMT_OP_START_DISCOVERY:

		err = start_discovery(sk, index);

		err = start_discovery(sk, index, buf + sizeof(*hdr), len);

		break;

	case MGMT_OP_STOP_DISCOVERY:

		err = stop_discovery(sk, index);