Commit 2cafd46a authored by Edmundo Carmona Antoranz's avatar Edmundo Carmona Antoranz Committed by Greg Kroah-Hartman
Browse files

staging: vt665x: fix alignment constraints 



Removing 2 instances of alignment warnings

drivers/staging/vt6655/rxtx.h:153:1: warning: alignment 1 of ‘struct vnt_cts’ is less than 2 [-Wpacked-not-aligned]
drivers/staging/vt6655/rxtx.h:163:1: warning: alignment 1 of ‘struct vnt_cts_fb’ is less than 2 [-Wpacked-not-aligned]

The root cause seems to be that _because_ struct ieee80211_cts is marked as __aligned(2),
this requires any encapsulating struct to also have an alignment of 2.

Fixes: 2faf12c5 ("staging: vt665x: fix alignment constraints")
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarEdmundo Carmona Antoranz <eantoranz@gmail.com>
Link: https://lore.kernel.org/r/20210316181736.2553318-1-eantoranz@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d2d106fe

drivers/staging/vt6655/rxtx.h

+2 −2
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ struct vnt_cts { 
	u16 reserved;

	struct ieee80211_cts data;

	u16 reserved2;

} __packed;

} __packed __aligned(2);



struct vnt_cts_fb {

	struct vnt_phy_field b;
@@ -160,7 +160,7 @@ struct vnt_cts_fb { 
	__le16 cts_duration_ba_f1;

	struct ieee80211_cts data;

	u16 reserved2;

} __packed;

} __packed __aligned(2);



struct vnt_tx_fifo_head {

	u8 tx_key[WLAN_KEY_LEN_CCMP];