aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wireless/ar9170
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-04-10 10:02:45 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-04-16 10:39:17 -0400
commit1269fa737f21b3f643e4b12d3ac9938b142a7f00 (patch)
tree3c992fb9a1d5fa9ea75ed045d3b8664a87815c7d /drivers/net/wireless/ar9170
parent91fe9ca74e8220f17e2fa71a92cda330857daac4 (diff)
ar9170: fix struct layout on arm
arm will pad even between u8's, so mark the structs/unions packed. Fixes a build bug on arm due to BUILD_BUG_ON tests in the code. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Reported-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ar9170')
-rw-r--r--drivers/net/wireless/ar9170/hw.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/ar9170/hw.h b/drivers/net/wireless/ar9170/hw.h
index 13091bd9d81..53e250a4278 100644
--- a/drivers/net/wireless/ar9170/hw.h
+++ b/drivers/net/wireless/ar9170/hw.h
@@ -310,7 +310,7 @@ struct ar9170_tx_control {
struct ar9170_rx_head {
u8 plcp[12];
-};
+} __packed;
struct ar9170_rx_tail {
union {
@@ -318,16 +318,16 @@ struct ar9170_rx_tail {
u8 rssi_ant0, rssi_ant1, rssi_ant2,
rssi_ant0x, rssi_ant1x, rssi_ant2x,
rssi_combined;
- };
+ } __packed;
u8 rssi[7];
- };
+ } __packed;
u8 evm_stream0[6], evm_stream1[6];
u8 phy_err;
u8 SAidx, DAidx;
u8 error;
u8 status;
-};
+} __packed;
#define AR9170_ENC_ALG_NONE 0x0
#define AR9170_ENC_ALG_WEP64 0x1