Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c5b9e51 authored by Cliff Cai's avatar Cliff Cai Committed by John W. Linville
Browse files

wireless: libertas: fix unaligned accesses 



Signed-off-by: default avatarCliff Cai <cliff.cai@analog.com>
Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
Acked-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2493928e

drivers/net/wireless/libertas/cmdresp.c

+5 −5
Original line number Diff line number Diff line
@@ -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],

drivers/net/wireless/libertas/scan.c

+1 −1
Original line number Diff line number Diff line
@@ -1129,7 +1129,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);