wireless: libertas: fix unaligned accesses (2c5b9e51) · Commits · 戴 / test

drivers/net/wireless/libertas/cmdresp.c

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -5,7 +5,7 @@
	#include <linux/delay.h>		#include <linux/delay.h>
	#include <linux/if_arp.h>		#include <linux/if_arp.h>
	#include <linux/netdevice.h>		#include <linux/netdevice.h>
			#include <asm/unaligned.h>
	#include <net/iw_handler.h>		#include <net/iw_handler.h>

	#include "host.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);		lbs_deb_enter(LBS_DEB_CMD);

	/* store the non average value */		/* store the non average value */
	priv->SNR[TYPE_BEACON][TYPE_NOAVG] = le16_to_cpu(rssirsp->SNR);		priv->SNR[TYPE_BEACON][TYPE_NOAVG] = get_unaligned_le16(&rssirsp->SNR);
	priv->NF[TYPE_BEACON][TYPE_NOAVG] = le16_to_cpu(rssirsp->noisefloor);		priv->NF[TYPE_BEACON][TYPE_NOAVG] = get_unaligned_le16(&rssirsp->noisefloor);

	priv->SNR[TYPE_BEACON][TYPE_AVG] = le16_to_cpu(rssirsp->avgSNR);		priv->SNR[TYPE_BEACON][TYPE_AVG] = get_unaligned_le16(&rssirsp->avgSNR);
	priv->NF[TYPE_BEACON][TYPE_AVG] = le16_to_cpu(rssirsp->avgnoisefloor);		priv->NF[TYPE_BEACON][TYPE_AVG] = get_unaligned_le16(&rssirsp->avgnoisefloor);

	priv->RSSI[TYPE_BEACON][TYPE_NOAVG] =		priv->RSSI[TYPE_BEACON][TYPE_NOAVG] =
	CAL_RSSI(priv->SNR[TYPE_BEACON][TYPE_NOAVG],		CAL_RSSI(priv->SNR[TYPE_BEACON][TYPE_NOAVG],

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1129,7 +1129,7 @@ static int lbs_ret_80211_scan(struct lbs_private *priv, unsigned long dummy,
	goto done;		goto done;
	}		}

	bytesleft = le16_to_cpu(scanresp->bssdescriptsize);		bytesleft = get_unaligned_le16(&scanresp->bssdescriptsize);
	lbs_deb_scan("SCAN_RESP: bssdescriptsize %d\n", bytesleft);		lbs_deb_scan("SCAN_RESP: bssdescriptsize %d\n", bytesleft);

	scanrespsize = le16_to_cpu(resp->size);		scanrespsize = le16_to_cpu(resp->size);