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

Commit af7985bf authored by Jefferson Delfes's avatar Jefferson Delfes Committed by Gustavo Padovan
Browse files

Bluetooth: Fix flags of mgmt_device_found event 



Change flags field to matches userspace structure.
This field needs to be converted to little endian before forward it.

Signed-off-by: default avatarJefferson Delfes <jefferson.delfes@openbossa.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 11778716

include/net/bluetooth/mgmt.h

+1 −1
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ struct mgmt_ev_auth_failed { 
struct mgmt_ev_device_found {

	struct mgmt_addr_info addr;

	__s8	rssi;

	__u8	flags[4];

	__le32	flags;

	__le16	eir_len;

	__u8	eir[0];

} __packed;

net/bluetooth/mgmt.c

+3 −2
Original line number Diff line number Diff line
@@ -3546,9 +3546,9 @@ int mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, 
	ev->addr.type = link_to_bdaddr(link_type, addr_type);

	ev->rssi = rssi;

	if (cfm_name)

		ev->flags[0] |= MGMT_DEV_FOUND_CONFIRM_NAME;

		ev->flags |= MGMT_DEV_FOUND_CONFIRM_NAME;

	if (!ssp)

		ev->flags[0] |= MGMT_DEV_FOUND_LEGACY_PAIRING;

		ev->flags |= MGMT_DEV_FOUND_LEGACY_PAIRING;



	if (eir_len > 0)

		memcpy(ev->eir, eir, eir_len);
@@ -3558,6 +3558,7 @@ int mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, 
					  dev_class, 3);



	ev->eir_len = cpu_to_le16(eir_len);

	ev->flags = cpu_to_le32(ev->flags);



	ev_size = sizeof(*ev) + eir_len;