* [PATCH] ar9170: fix struct layout on arm
@ 2009-04-10 8:02 Johannes Berg
0 siblings, 0 replies; only message in thread
From: Johannes Berg @ 2009-04-10 8:02 UTC (permalink / raw)
To: John Linville; +Cc: Al Viro, linux-wireless, chunkeey
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>
---
drivers/net/wireless/ar9170/hw.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- wireless-testing.orig/drivers/net/wireless/ar9170/hw.h 2009-04-10 09:58:05.000000000 +0200
+++ wireless-testing/drivers/net/wireless/ar9170/hw.h 2009-04-10 09:58:33.000000000 +0200
@@ -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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-04-10 8:02 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-04-10 8:02 [PATCH] ar9170: fix struct layout on arm Johannes Berg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox