Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/wireless/ar9170/hw.h

+4 −4
Original line number Diff line number Diff line
@@ -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