aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorArend van Spriel <arend@broadcom.com>2013-04-05 04:57:39 -0400
committerJohn W. Linville <linville@tuxdriver.com>2013-04-08 15:28:40 -0400
commita2ffc5668e2742db7bae48ad6098e45f8d3ea19e (patch)
tree4e1bb1c6f7e1377c9d6f0d82e83a8cf1854732cc /drivers/net/wireless
parent2716fd7d455e277ad8676df794fe65bd1e1ba442 (diff)
brcmfmac: fix unaligned access in TXSTATUS signal handling
reported by Hante. Needs to be squashed in commit 187fbcec. Reviewed-by: Hante Meuleman <meuleman@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
index 8ce79af47e66..451cfc1b2c47 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
@@ -1181,13 +1181,15 @@ static int brcmf_fws_fifocreditback_indicate(struct brcmf_fws_info *fws,
1181 1181
1182static int brcmf_fws_txstatus_indicate(struct brcmf_fws_info *fws, u8 *data) 1182static int brcmf_fws_txstatus_indicate(struct brcmf_fws_info *fws, u8 *data)
1183{ 1183{
1184 __le32 status_le;
1184 u32 status; 1185 u32 status;
1185 u32 hslot; 1186 u32 hslot;
1186 u32 genbit; 1187 u32 genbit;
1187 u8 flags; 1188 u8 flags;
1188 1189
1189 fws->stats.txs_indicate++; 1190 fws->stats.txs_indicate++;
1190 status = le32_to_cpu(*(__le32 *)data); 1191 memcpy(&status_le, data, sizeof(status_le));
1192 status = le32_to_cpu(status_le);
1191 flags = brcmf_txstatus_get_field(status, FLAGS); 1193 flags = brcmf_txstatus_get_field(status, FLAGS);
1192 hslot = brcmf_txstatus_get_field(status, HSLOT); 1194 hslot = brcmf_txstatus_get_field(status, HSLOT);
1193 genbit = brcmf_txstatus_get_field(status, GENERATION); 1195 genbit = brcmf_txstatus_get_field(status, GENERATION);