* [PATCH] Bluetooth: Fix broken usage of get_unaligned_le16
@ 2012-03-13 3:31 Marcel Holtmann
2012-03-13 7:29 ` Andrei Emeltchenko
2012-03-16 15:36 ` Johan Hedberg
0 siblings, 2 replies; 4+ messages in thread
From: Marcel Holtmann @ 2012-03-13 3:31 UTC (permalink / raw)
To: linux-bluetooth
In case the struct is already __packed, there is no need to use unaligned
access to the data. So just use __le16_to_cpu in these cases.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
---
net/bluetooth/mgmt.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 5aa2c9e..ea2677d 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -862,7 +862,7 @@ static int set_discoverable(struct sock *sk, struct hci_dev *hdev, void *data,
BT_DBG("request for %s", hdev->name);
- timeout = get_unaligned_le16(&cp->timeout);
+ timeout = __le16_to_cpu(cp->timeout);
if (!cp->val && timeout > 0)
return cmd_status(sk, hdev->id, MGMT_OP_SET_DISCOVERABLE,
MGMT_STATUS_INVALID_PARAMS);
@@ -1461,7 +1461,7 @@ static int load_link_keys(struct sock *sk, struct hci_dev *hdev, void *data,
u16 key_count, expected_len;
int i;
- key_count = get_unaligned_le16(&cp->key_count);
+ key_count = __le16_to_cpu(cp->key_count);
expected_len = sizeof(*cp) + key_count *
sizeof(struct mgmt_link_key_info);
@@ -2606,7 +2606,7 @@ static int load_long_term_keys(struct sock *sk, struct hci_dev *hdev,
u16 key_count, expected_len;
int i;
- key_count = get_unaligned_le16(&cp->key_count);
+ key_count = __le16_to_cpu(cp->key_count);
expected_len = sizeof(*cp) + key_count *
sizeof(struct mgmt_ltk_info);
@@ -2717,9 +2717,9 @@ int mgmt_control(struct sock *sk, struct msghdr *msg, size_t msglen)
}
hdr = buf;
- opcode = get_unaligned_le16(&hdr->opcode);
- index = get_unaligned_le16(&hdr->index);
- len = get_unaligned_le16(&hdr->len);
+ opcode = __le16_to_cpu(hdr->opcode);
+ index = __le16_to_cpu(hdr->index);
+ len = __le16_to_cpu(hdr->len);
if (len != msglen - sizeof(*hdr)) {
err = -EINVAL;
--
1.7.7.6
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] Bluetooth: Fix broken usage of get_unaligned_le16
2012-03-13 3:31 [PATCH] Bluetooth: Fix broken usage of get_unaligned_le16 Marcel Holtmann
@ 2012-03-13 7:29 ` Andrei Emeltchenko
2012-03-13 15:15 ` Marcel Holtmann
2012-03-16 15:36 ` Johan Hedberg
1 sibling, 1 reply; 4+ messages in thread
From: Andrei Emeltchenko @ 2012-03-13 7:29 UTC (permalink / raw)
To: Marcel Holtmann; +Cc: linux-bluetooth
Hi Marcel,
On Mon, Mar 12, 2012 at 08:31:08PM -0700, Marcel Holtmann wrote:
> In case the struct is already __packed, there is no need to use unaligned
> access to the data. So just use __le16_to_cpu in these cases.
One minor comment related to use of __xxx versions. What is the general
rule when to use __le16_to_cpu and when le16_to_cpu? In mgmt.c looks that
mostly in use version without underscore.
Best regards
Andrei Emeltchenko
>
> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
> ---
> net/bluetooth/mgmt.c | 12 ++++++------
> 1 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
> index 5aa2c9e..ea2677d 100644
> --- a/net/bluetooth/mgmt.c
> +++ b/net/bluetooth/mgmt.c
> @@ -862,7 +862,7 @@ static int set_discoverable(struct sock *sk, struct hci_dev *hdev, void *data,
>
> BT_DBG("request for %s", hdev->name);
>
> - timeout = get_unaligned_le16(&cp->timeout);
> + timeout = __le16_to_cpu(cp->timeout);
> if (!cp->val && timeout > 0)
> return cmd_status(sk, hdev->id, MGMT_OP_SET_DISCOVERABLE,
> MGMT_STATUS_INVALID_PARAMS);
> @@ -1461,7 +1461,7 @@ static int load_link_keys(struct sock *sk, struct hci_dev *hdev, void *data,
> u16 key_count, expected_len;
> int i;
>
> - key_count = get_unaligned_le16(&cp->key_count);
> + key_count = __le16_to_cpu(cp->key_count);
>
> expected_len = sizeof(*cp) + key_count *
> sizeof(struct mgmt_link_key_info);
> @@ -2606,7 +2606,7 @@ static int load_long_term_keys(struct sock *sk, struct hci_dev *hdev,
> u16 key_count, expected_len;
> int i;
>
> - key_count = get_unaligned_le16(&cp->key_count);
> + key_count = __le16_to_cpu(cp->key_count);
>
> expected_len = sizeof(*cp) + key_count *
> sizeof(struct mgmt_ltk_info);
> @@ -2717,9 +2717,9 @@ int mgmt_control(struct sock *sk, struct msghdr *msg, size_t msglen)
> }
>
> hdr = buf;
> - opcode = get_unaligned_le16(&hdr->opcode);
> - index = get_unaligned_le16(&hdr->index);
> - len = get_unaligned_le16(&hdr->len);
> + opcode = __le16_to_cpu(hdr->opcode);
> + index = __le16_to_cpu(hdr->index);
> + len = __le16_to_cpu(hdr->len);
>
> if (len != msglen - sizeof(*hdr)) {
> err = -EINVAL;
> --
> 1.7.7.6
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Bluetooth: Fix broken usage of get_unaligned_le16
2012-03-13 7:29 ` Andrei Emeltchenko
@ 2012-03-13 15:15 ` Marcel Holtmann
0 siblings, 0 replies; 4+ messages in thread
From: Marcel Holtmann @ 2012-03-13 15:15 UTC (permalink / raw)
To: Andrei Emeltchenko; +Cc: linux-bluetooth
Hi Andrei,
> > In case the struct is already __packed, there is no need to use unaligned
> > access to the data. So just use __le16_to_cpu in these cases.
>
> One minor comment related to use of __xxx versions. What is the general
> rule when to use __le16_to_cpu and when le16_to_cpu? In mgmt.c looks that
> mostly in use version without underscore.
honestly I do not know. We have been using __le16_to_cpu and cpu_to_le16
as long as I can remember.
Regards
Marcel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Bluetooth: Fix broken usage of get_unaligned_le16
2012-03-13 3:31 [PATCH] Bluetooth: Fix broken usage of get_unaligned_le16 Marcel Holtmann
2012-03-13 7:29 ` Andrei Emeltchenko
@ 2012-03-16 15:36 ` Johan Hedberg
1 sibling, 0 replies; 4+ messages in thread
From: Johan Hedberg @ 2012-03-16 15:36 UTC (permalink / raw)
To: Marcel Holtmann; +Cc: linux-bluetooth
Hi Marcel,
On Mon, Mar 12, 2012, Marcel Holtmann wrote:
> In case the struct is already __packed, there is no need to use unaligned
> access to the data. So just use __le16_to_cpu in these cases.
>
> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
> ---
> net/bluetooth/mgmt.c | 12 ++++++------
> 1 files changed, 6 insertions(+), 6 deletions(-)
Applied. Thanks.
Johan
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-03-16 15:36 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-03-13 3:31 [PATCH] Bluetooth: Fix broken usage of get_unaligned_le16 Marcel Holtmann
2012-03-13 7:29 ` Andrei Emeltchenko
2012-03-13 15:15 ` Marcel Holtmann
2012-03-16 15:36 ` Johan Hedberg
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.