[PATCH v2] wireless: libertas: fix unaligned accesses

[Andrey Yurovsky]

On Tue, May 26, 2009 at 8:37 PM, Mike Frysinger <vapier at gentoo.org> wrote:
> From: Cliff Cai <cliff.cai at analog.com>
>
> Signed-off-by: Cliff Cai <cliff.cai at analog.com>
> Signed-off-by: Mike Frysinger <vapier at gentoo.org>
> Signed-off-by: Bryan Wu <cooloney at kernel.org>
> ---
> v2
>        - fix style issues pointed out by Sebastian Andrzej Siewior
>
>  drivers/net/wireless/libertas/cmdresp.c |   10 +++++-----
>  drivers/net/wireless/libertas/scan.c    |    2 +-
>  2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c
> index bcf2a97..c3e947c 100644
> --- a/drivers/net/wireless/libertas/cmdresp.c
> +++ b/drivers/net/wireless/libertas/cmdresp.c
> @@ -5,7 +5,7 @@
>  #include <linux/delay.h>
>  #include <linux/if_arp.h>
>  #include <linux/netdevice.h>
> -
> +#include <asm/unaligned.h>
>  #include <net/iw_handler.h>
>
>  #include "host.h"
> @@ -154,11 +154,11 @@ static int lbs_ret_802_11_rssi(struct lbs_private *priv,
>        lbs_deb_enter(LBS_DEB_CMD);
>
>        /* store the non average value */
> -       priv->SNR[TYPE_BEACON][TYPE_NOAVG] = le16_to_cpu(rssirsp->SNR);
> -       priv->NF[TYPE_BEACON][TYPE_NOAVG] = le16_to_cpu(rssirsp->noisefloor);
> +       priv->SNR[TYPE_BEACON][TYPE_NOAVG] = get_unaligned_le16(&rssirsp->SNR);
> +       priv->NF[TYPE_BEACON][TYPE_NOAVG] = get_unaligned_le16(&rssirsp->noisefloor);
>
> -       priv->SNR[TYPE_BEACON][TYPE_AVG] = le16_to_cpu(rssirsp->avgSNR);
> -       priv->NF[TYPE_BEACON][TYPE_AVG] = le16_to_cpu(rssirsp->avgnoisefloor);
> +       priv->SNR[TYPE_BEACON][TYPE_AVG] = get_unaligned_le16(&rssirsp->avgSNR);
> +       priv->NF[TYPE_BEACON][TYPE_AVG] = get_unaligned_le16(&rssirsp->avgnoisefloor);
>
>        priv->RSSI[TYPE_BEACON][TYPE_NOAVG] =
>            CAL_RSSI(priv->SNR[TYPE_BEACON][TYPE_NOAVG],
> diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
> index 8124db3..68bf6b7 100644
> --- a/drivers/net/wireless/libertas/scan.c
> +++ b/drivers/net/wireless/libertas/scan.c
> @@ -1130,7 +1130,7 @@ static int lbs_ret_80211_scan(struct lbs_private *priv, unsigned long dummy,
>                goto done;
>        }
>
> -       bytesleft = le16_to_cpu(scanresp->bssdescriptsize);
> +       bytesleft = get_unaligned_le16(&scanresp->bssdescriptsize);
>        lbs_deb_scan("SCAN_RESP: bssdescriptsize %d\n", bytesleft);
>
>        scanrespsize = le16_to_cpu(resp->size);
> --
> 1.6.3.1

Please CC linux-wireless at vger.kernel.org

 -Andrey