Skip to content

Commit

Permalink
Bluetooth: MGMT: Fixes build warnings with C=1
Browse files Browse the repository at this point in the history
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: 600a874 ("Bluetooth: Implementation of MGMT_OP_SET_BLOCKED_KEYS.")
Fixes: 4c54bf2 ("Bluetooth: Add get/set device flags mgmt op")
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
  • Loading branch information
Luiz Augusto von Dentz committed Aug 9, 2022
1 parent 889f034 commit 0c79375
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions net/bluetooth/mgmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 0c79375

Please sign in to comment.