Commit 1269fa73 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville

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: default avatarJohannes Berg <johannes@sipsolutions.net>
Reported-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 91fe9ca7
...@@ -310,7 +310,7 @@ struct ar9170_tx_control { ...@@ -310,7 +310,7 @@ struct ar9170_tx_control {
struct ar9170_rx_head { struct ar9170_rx_head {
u8 plcp[12]; u8 plcp[12];
}; } __packed;
struct ar9170_rx_tail { struct ar9170_rx_tail {
union { union {
...@@ -318,16 +318,16 @@ struct ar9170_rx_tail { ...@@ -318,16 +318,16 @@ struct ar9170_rx_tail {
u8 rssi_ant0, rssi_ant1, rssi_ant2, u8 rssi_ant0, rssi_ant1, rssi_ant2,
rssi_ant0x, rssi_ant1x, rssi_ant2x, rssi_ant0x, rssi_ant1x, rssi_ant2x,
rssi_combined; rssi_combined;
}; } __packed;
u8 rssi[7]; u8 rssi[7];
}; } __packed;
u8 evm_stream0[6], evm_stream1[6]; u8 evm_stream0[6], evm_stream1[6];
u8 phy_err; u8 phy_err;
u8 SAidx, DAidx; u8 SAidx, DAidx;
u8 error; u8 error;
u8 status; u8 status;
}; } __packed;
#define AR9170_ENC_ALG_NONE 0x0 #define AR9170_ENC_ALG_NONE 0x0
#define AR9170_ENC_ALG_WEP64 0x1 #define AR9170_ENC_ALG_WEP64 0x1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment