lkml.org 
[lkml]   [2008]   [May]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH 1/1] [net/irda]: Fix a misalign access issue.
From
Date
Hi Bryan,

> From: Graf Yang <graf.yang@analog.com>
>
> Signed-off-by: Graf Yang <graf.yang@analog.com>
> Signed-off-by: Bryan Wu <cooloney@kernel.org>
> ---
> net/irda/discovery.c | 8 +++++---
> net/irda/irlmp.c | 2 +-
> 2 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/net/irda/discovery.c b/net/irda/discovery.c
> index bfacef8..a6f99b5 100644
> --- a/net/irda/discovery.c
> +++ b/net/irda/discovery.c
> @@ -40,6 +40,8 @@
>
> #include <net/irda/discovery.h>
>
> +#include <asm/unaligned.h>
> +
> /*
> * Function irlmp_add_discovery (cachelog, discovery)
> *
> @@ -87,7 +89,7 @@ void irlmp_add_discovery(hashbin_t *cachelog, discovery_t *new)
> */
> hashbin_remove_this(cachelog, (irda_queue_t *) node);
> /* Check if hints bits are unchanged */
> - if(u16ho(node->data.hints) == u16ho(new->data.hints))
> + if (get_unaligned((__u16 *)node->data.hints) == get_unaligned((__u16 *)new->data.hints))
> /* Set time of first discovery for this node */
> new->firststamp = node->firststamp;
> kfree(node);
> @@ -281,9 +283,9 @@ struct irda_device_info *irlmp_copy_discoveries(hashbin_t *log, int *pn,
> /* Mask out the ones we don't want :
> * We want to match the discovery mask, and to get only
> * the most recent one (unless we want old ones) */
> - if ((u16ho(discovery->data.hints) & mask) &&
> + if ((get_unaligned((__u16 *)discovery->data.hints) & mask) &&
> ((old_entries) ||
> - ((jiffies - discovery->firststamp) < j_timeout)) ) {
> + ((jiffies - discovery->firststamp) < j_timeout))) {
> /* Create buffer as needed.
> * As this function get called a lot and most time
> * we don't have anything to put in the log (we are
> diff --git a/net/irda/irlmp.c b/net/irda/irlmp.c
> index 1f81f8e..7b95cd6 100644
> --- a/net/irda/irlmp.c
> +++ b/net/irda/irlmp.c
> @@ -1086,7 +1086,7 @@ discovery_t *irlmp_get_discovery_response(void)
>
> IRDA_ASSERT(irlmp != NULL, return NULL;);
>
> - u16ho(irlmp->discovery_rsp.data.hints) = irlmp->hints.word;
> + put_unaligned(irlmp->hints.word, (__u16 *)irlmp->discovery_rsp.data.hints);
>
> /*
> * Set character set for device name (we use ASCII), and

what about net/irda/irnet/irnet_irda.c and why not also kill the u16ho
macro at the same time.

Regards

Marcel




\
 
 \ /
  Last update: 2008-05-12 15:17    [W:0.054 / U:0.712 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site