Commit 0c793758 authored by Luiz Augusto von Dentz's avatar Luiz Augusto von Dentz
Browse files

Bluetooth: MGMT: Fixes build warnings with C=1 



This fixes the following warning when building with make C=1:

net/bluetooth/mgmt.c:3821:29: warning: restricted __le16 degrades to integer
net/bluetooth/mgmt.c:4625:9: warning: cast to restricted __le32

Fixes: 600a8749 ("Bluetooth: Implementation of MGMT_OP_SET_BLOCKED_KEYS.")
Fixes: 4c54bf2b ("Bluetooth: Add get/set device flags mgmt op")
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent 889f0346

net/bluetooth/mgmt.c

+2 −3
Original line number Diff line number Diff line
@@ -3819,7 +3819,7 @@ static int set_blocked_keys(struct sock *sk, struct hci_dev *hdev, void *data, 


	hci_blocked_keys_clear(hdev);



	for (i = 0; i < keys->key_count; ++i) {

	for (i = 0; i < key_count; ++i) {

		struct blocked_key *b = kzalloc(sizeof(*b), GFP_KERNEL);



		if (!b) {
@@ -4624,8 +4624,7 @@ static int set_device_flags(struct sock *sk, struct hci_dev *hdev, void *data, 
	u32 current_flags = __le32_to_cpu(cp->current_flags);



	bt_dev_dbg(hdev, "Set device flags %pMR (type 0x%x) = 0x%x",

		   &cp->addr.bdaddr, cp->addr.type,

		   __le32_to_cpu(current_flags));

		   &cp->addr.bdaddr, cp->addr.type, current_flags);



	// We should take hci_dev_lock() early, I think.. conn_flags can change

	supported_flags = hdev->conn_flags;