Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 816a11d5 authored by Johan Hedberg's avatar Johan Hedberg
Browse files

Bluetooth: Use kernel int types instead of ones from stdint.h 



u8/__u8/u32/etc should be used in the kernel instead of stdint.h types.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 9b27f350

include/net/bluetooth/hci.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -691,8 +691,8 @@ struct hci_cp_host_buffer_size { 




#define HCI_OP_WRITE_EIR		0x0c52

#define HCI_OP_WRITE_EIR		0x0c52

struct hci_cp_write_eir {

struct hci_cp_write_eir {

	uint8_t		fec;

	__u8		fec;

	uint8_t		data[HCI_MAX_EIR_LENGTH];

	__u8		data[HCI_MAX_EIR_LENGTH];

} __packed;

} __packed;





#define HCI_OP_READ_SSP_MODE		0x0c55

#define HCI_OP_READ_SSP_MODE		0x0c55

net/bluetooth/bnep/sock.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -143,10 +143,10 @@ static int bnep_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigne 
{

{

	if (cmd == BNEPGETCONNLIST) {

	if (cmd == BNEPGETCONNLIST) {

		struct bnep_connlist_req cl;

		struct bnep_connlist_req cl;

		uint32_t uci;

		u32 uci;

		int err;

		int err;





		if (get_user(cl.cnum, (uint32_t __user *) arg) ||

		if (get_user(cl.cnum, (u32 __user *) arg) ||

				get_user(uci, (u32 __user *) (arg + 4)))

				get_user(uci, (u32 __user *) (arg + 4)))

			return -EFAULT;

			return -EFAULT;
@@ -157,7 +157,7 @@ static int bnep_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigne 




		err = bnep_get_connlist(&cl);

		err = bnep_get_connlist(&cl);





		if (!err && put_user(cl.cnum, (uint32_t __user *) arg))

		if (!err && put_user(cl.cnum, (u32 __user *) arg))

			err = -EFAULT;

			err = -EFAULT;





		return err;

		return err;

net/bluetooth/cmtp/sock.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -137,10 +137,10 @@ static int cmtp_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigne 
{

{

	if (cmd == CMTPGETCONNLIST) {

	if (cmd == CMTPGETCONNLIST) {

		struct cmtp_connlist_req cl;

		struct cmtp_connlist_req cl;

		uint32_t uci;

		u32 uci;

		int err;

		int err;





		if (get_user(cl.cnum, (uint32_t __user *) arg) ||

		if (get_user(cl.cnum, (u32 __user *) arg) ||

				get_user(uci, (u32 __user *) (arg + 4)))

				get_user(uci, (u32 __user *) (arg + 4)))

			return -EFAULT;

			return -EFAULT;
@@ -151,7 +151,7 @@ static int cmtp_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigne 




		err = cmtp_get_connlist(&cl);

		err = cmtp_get_connlist(&cl);





		if (!err && put_user(cl.cnum, (uint32_t __user *) arg))

		if (!err && put_user(cl.cnum, (u32 __user *) arg))

			err = -EFAULT;

			err = -EFAULT;





		return err;

		return err;

net/bluetooth/hidp/sock.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -160,10 +160,10 @@ static int hidp_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigne 
{

{

	if (cmd == HIDPGETCONNLIST) {

	if (cmd == HIDPGETCONNLIST) {

		struct hidp_connlist_req cl;

		struct hidp_connlist_req cl;

		uint32_t uci;

		u32 uci;

		int err;

		int err;





		if (get_user(cl.cnum, (uint32_t __user *) arg) ||

		if (get_user(cl.cnum, (u32 __user *) arg) ||

				get_user(uci, (u32 __user *) (arg + 4)))

				get_user(uci, (u32 __user *) (arg + 4)))

			return -EFAULT;

			return -EFAULT;
@@ -174,7 +174,7 @@ static int hidp_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigne 




		err = hidp_get_connlist(&cl);

		err = hidp_get_connlist(&cl);





		if (!err && put_user(cl.cnum, (uint32_t __user *) arg))

		if (!err && put_user(cl.cnum, (u32 __user *) arg))

			err = -EFAULT;

			err = -EFAULT;





		return err;

		return err;

net/bluetooth/mgmt.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1075,7 +1075,7 @@ static int set_link_security(struct sock *sk, u16 index, void *data, u16 len) 
	struct mgmt_mode *cp = data;

	struct mgmt_mode *cp = data;

	struct pending_cmd *cmd;

	struct pending_cmd *cmd;

	struct hci_dev *hdev;

	struct hci_dev *hdev;

	uint8_t val;

	u8 val;

	int err;

	int err;





	BT_DBG("request for hci%u", index);

	BT_DBG("request for hci%u", index);
@@ -1147,7 +1147,7 @@ static int set_ssp(struct sock *sk, u16 index, void *data, u16 len) 
	struct mgmt_mode *cp = data;

	struct mgmt_mode *cp = data;

	struct pending_cmd *cmd;

	struct pending_cmd *cmd;

	struct hci_dev *hdev;

	struct hci_dev *hdev;

	uint8_t val;

	u8 val;

	int err;

	int err;





	BT_DBG("request for hci%u", index);

	BT_DBG("request for hci%u", index);