diff options
author | Andrei Emeltchenko <andrei.emeltchenko@intel.com> | 2012-06-18 06:03:46 -0400 |
---|---|---|
committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-06-18 22:55:59 -0400 |
commit | 33cef264cd945d64ae8cbbfc5f246661f9655483 (patch) | |
tree | 0a758582574f6e9cd6f421c3cb951a833ab84af7 /net | |
parent | 3701f94451ea341fb5305cb55f7afc04bf0dc56e (diff) |
Bluetooth: Fix compile warnings in mgmt
Commit af7985bf85840e3dc90ba108a679db044f91f00e 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: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net')
-rw-r--r-- | net/bluetooth/mgmt.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 5aa5592ad578..eff610d5081a 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c | |||
@@ -3546,9 +3546,9 @@ int mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, | |||
3546 | ev->addr.type = link_to_bdaddr(link_type, addr_type); | 3546 | ev->addr.type = link_to_bdaddr(link_type, addr_type); |
3547 | ev->rssi = rssi; | 3547 | ev->rssi = rssi; |
3548 | if (cfm_name) | 3548 | if (cfm_name) |
3549 | ev->flags |= MGMT_DEV_FOUND_CONFIRM_NAME; | 3549 | ev->flags |= cpu_to_le32(MGMT_DEV_FOUND_CONFIRM_NAME); |
3550 | if (!ssp) | 3550 | if (!ssp) |
3551 | ev->flags |= MGMT_DEV_FOUND_LEGACY_PAIRING; | 3551 | ev->flags |= cpu_to_le32(MGMT_DEV_FOUND_LEGACY_PAIRING); |
3552 | 3552 | ||
3553 | if (eir_len > 0) | 3553 | if (eir_len > 0) |
3554 | memcpy(ev->eir, eir, eir_len); | 3554 | memcpy(ev->eir, eir, eir_len); |
@@ -3558,8 +3558,6 @@ int mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, | |||
3558 | dev_class, 3); | 3558 | dev_class, 3); |
3559 | 3559 | ||
3560 | ev->eir_len = cpu_to_le16(eir_len); | 3560 | ev->eir_len = cpu_to_le16(eir_len); |
3561 | ev->flags = cpu_to_le32(ev->flags); | ||
3562 | |||
3563 | ev_size = sizeof(*ev) + eir_len; | 3561 | ev_size = sizeof(*ev) + eir_len; |
3564 | 3562 | ||
3565 | return mgmt_event(MGMT_EV_DEVICE_FOUND, hdev, ev, ev_size, NULL); | 3563 | return mgmt_event(MGMT_EV_DEVICE_FOUND, hdev, ev, ev_size, NULL); |