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

Commit 33cef264 authored by Andrei Emeltchenko's avatar Andrei Emeltchenko Committed by Gustavo Padovan
Browse files

Bluetooth: Fix compile warnings in mgmt 



Commit af7985bf introduced regression
resulting in complie warnings:

...
net/bluetooth/mgmt.c:3568:27: warning: invalid assignment: |=
net/bluetooth/mgmt.c:3568:27:    left side has type restricted __le32
net/bluetooth/mgmt.c:3568:27:    right side has type int
net/bluetooth/mgmt.c:3570:27: warning: invalid assignment: |=
net/bluetooth/mgmt.c:3570:27:    left side has type restricted __le32
net/bluetooth/mgmt.c:3570:27:    right side has type int
net/bluetooth/mgmt.c:3580:21: warning: cast from restricted __le32
...

Signed-off-by: default avatarAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 3701f944

net/bluetooth/mgmt.c

+2 −4
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 |= MGMT_DEV_FOUND_CONFIRM_NAME;

		ev->flags |= cpu_to_le32(MGMT_DEV_FOUND_CONFIRM_NAME);

	if (!ssp)

		ev->flags |= MGMT_DEV_FOUND_LEGACY_PAIRING;

		ev->flags |= cpu_to_le32(MGMT_DEV_FOUND_LEGACY_PAIRING);



	if (eir_len > 0)

		memcpy(ev->eir, eir, eir_len);
@@ -3558,8 +3558,6 @@ 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;



	return mgmt_event(MGMT_EV_DEVICE_FOUND, hdev, ev, ev_size, NULL);